From edf2f9d53af91126ec9f04142c8fedc2a1997ed9 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Sun, 15 Dec 2013 19:41:16 +0100
Subject: Check order (fixing bug 1219264 ?)

(bzr r12851)
---
 src/ui/dialog/swatches.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3