From bc9571c9f8eab4884286d90ce658ca856ab79ffa Mon Sep 17 00:00:00 2001
From: John Smith <john.smith7545@yahoo.com>
Date: Sat, 4 Aug 2012 11:35:13 +0900
Subject: Fix for 1030239 : Custom markers only added to the list in Stroke
 Style after reloading the file

(bzr r11589)
---
 src/widgets/stroke-marker-selector.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 21207419b..ccefdf53e 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -109,9 +109,14 @@ MarkerComboBox::handleDefsModified(MarkerComboBox *self)
 void
 MarkerComboBox::refreshHistory()
 {
+    if (updating)
+        return;
+
+    updating = true;
     const char *active = get_active()->get_value(marker_columns.marker);
     sp_marker_list_from_doc(doc, true);
     set_selected(active);
+    updating = false;
 }
 
 /**
-- 
cgit v1.2.3