From c1c52c0093a46c8aa83abc9e626c0d3db738d6e9 Mon Sep 17 00:00:00 2001 From: John Smith Date: Tue, 28 Aug 2012 11:02:41 +0900 Subject: Fix for 165865 : markers must take object's stroke color - fix for floating window bug (bzr r11626) --- src/widgets/stroke-marker-selector.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/widgets/stroke-marker-selector.cpp') 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(); -- cgit v1.2.3