summaryrefslogtreecommitdiffstats
path: root/src/widgets/stroke-marker-selector.cpp
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-08-28 02:02:41 +0000
committerJohn Smith <john.smith7545@yahoo.com>2012-08-28 02:02:41 +0000
commitc1c52c0093a46c8aa83abc9e626c0d3db738d6e9 (patch)
treedf93ba4dd5db4f7bba46a38ed66a0da0954381dc /src/widgets/stroke-marker-selector.cpp
parentFix for 1042500 : Align and Distribute dialog when floating doesnt work on ac... (diff)
downloadinkscape-c1c52c0093a46c8aa83abc9e626c0d3db738d6e9.tar.gz
inkscape-c1c52c0093a46c8aa83abc9e626c0d3db738d6e9.zip
Fix for 165865 : markers must take object's stroke color - fix for floating window bug
(bzr r11626)
Diffstat (limited to 'src/widgets/stroke-marker-selector.cpp')
-rw-r--r--src/widgets/stroke-marker-selector.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index ad14e8510..0016dcf1f 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -444,7 +444,9 @@ MarkerComboBox::update_marker_image(gchar const *mname)
unsigned const visionkey = SPItem::display_key_new(1);
drawing.setRoot(sandbox->getRoot()->invoke_show(drawing, visionkey, SP_ITEM_SHOW_DISPLAY));
Gtk::Image *prv = create_marker_image(22, mname, doc, drawing, visionkey);
- prv->show();
+ if (prv) {
+ prv->show();
+ }
sandbox->getRoot()->invoke_hide(visionkey);
for(Gtk::TreeIter iter = marker_store->children().begin();