diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2013-12-15 18:41:16 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2013-12-15 18:41:16 +0000 |
| commit | edf2f9d53af91126ec9f04142c8fedc2a1997ed9 (patch) | |
| tree | 90d12c92dc96fd5babe0e7c2ab96ee8094f0d99f | |
| parent | added show debug info option, small text changes (diff) | |
| download | inkscape-edf2f9d53af91126ec9f04142c8fedc2a1997ed9.tar.gz inkscape-edf2f9d53af91126ec9f04142c8fedc2a1997ed9.zip | |
Check order (fixing bug 1219264 ?)
(bzr r12851)
| -rw-r--r-- | src/ui/dialog/swatches.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 1e5baffd2..3f161ad28 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -309,8 +309,8 @@ gboolean colorItemHandleButtonPress( GtkWidget* widget, GdkEventButton* event, g gtk_widget_show_all(popupMenu); } - ColorItem* item = reinterpret_cast<ColorItem*>(user_data); - if ( item ) { + if ( user_data ) { + ColorItem* item = reinterpret_cast<ColorItem*>(user_data); bool show = swp && (swp->getSelectedIndex() == 0); for ( std::vector<GtkWidget*>::iterator it = popupExtras.begin(); it != popupExtras.end(); ++ it) { gtk_widget_set_sensitive(*it, show); |