[glabels] Prevent crash when using combo search on “Select Product”



commit 20490ccceab908899cd8c73164a29d48f54b50eb
Author: Clemens Fries <githubert xenoworld de>
Date:   Mon Sep 18 21:02:09 2017 +0200

    Prevent crash when using combo search on “Select Product”
    
    GtkSelectionMode can also be GTK_SELECTION_BROWSE, which does not
    guarantee that a selection is available. Checking the return value
    of gtk_tree_selection_get_selected() seems to provides a clearer
    picture.

 src/media-select.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/media-select.c b/src/media-select.c
index 11ecda0..88c80e7 100644
--- a/src/media-select.c
+++ b/src/media-select.c
@@ -786,14 +786,15 @@ gl_media_select_get_name (glMediaSelect *this)
                 g_assert_not_reached ();
         }
 
-        if (gtk_tree_selection_get_mode (selection) == GTK_SELECTION_NONE)
+        gboolean has_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
+
+        if (has_selection == TRUE)
         {
-                name = NULL;
+                gtk_tree_model_get (model, &iter, NAME_COLUMN, &name, -1);
         }
         else
         {
-                gtk_tree_selection_get_selected (selection, &model, &iter);
-                gtk_tree_model_get (model, &iter, NAME_COLUMN, &name, -1);
+                name = NULL;
         }
 
         gl_debug (DEBUG_MEDIA_SELECT, "END");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]