[glabels/vala] Fix crash when destroying NewLabelDialog.



commit 2abb6e3bb956949539b4623742ac809d76209f33
Author: Jim Evins <evins snaught com>
Date:   Sat May 24 16:09:58 2014 -0400

    Fix crash when destroying NewLabelDialog.

 glabels/file.vala             |    2 +-
 glabels/new_label_dialog.vala |   26 ++++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/glabels/file.vala b/glabels/file.vala
index 094ded4..dd6280c 100644
--- a/glabels/file.vala
+++ b/glabels/file.vala
@@ -53,7 +53,7 @@ namespace glabels
                                        new_window.show_all();
                                }
 
-                               dialog.hide();
+                               dialog.destroy();
                        }
                }
 
diff --git a/glabels/new_label_dialog.vala b/glabels/new_label_dialog.vala
index 8db64da..f1aa2f7 100644
--- a/glabels/new_label_dialog.vala
+++ b/glabels/new_label_dialog.vala
@@ -432,13 +432,16 @@ namespace glabels
                {
                        List<Gtk.TreePath> list = recent_icon_view.get_selected_items();
 
-                       Gtk.TreeIter iter;
-                       if ( recent_model.get_iter( out iter, list.first().data ) )
+                       if ( list != null )
                        {
-                               Value value;
-                               recent_model.get_value( iter, 0, out value );
+                               Gtk.TreeIter iter;
+                               if ( recent_model.get_iter( out iter, list.first().data ) )
+                               {
+                                       Value value;
+                                       recent_model.get_value( iter, 0, out value );
 
-                               template_name = value.get_string();
+                                       template_name = value.get_string();
+                               }
                        }
                }
 
@@ -458,13 +461,16 @@ namespace glabels
                {
                        List<Gtk.TreePath> list = search_icon_view.get_selected_items();
 
-                       Gtk.TreeIter iter;
-                       if ( search_filtered_model.get_iter( out iter, list.first().data ) )
+                       if ( list != null )
                        {
-                               Value value;
-                               search_filtered_model.get_value( iter, 0, out value );
+                               Gtk.TreeIter iter;
+                               if ( search_filtered_model.get_iter( out iter, list.first().data ) )
+                               {
+                                       Value value;
+                                       search_filtered_model.get_value( iter, 0, out value );
 
-                               template_name = value.get_string();
+                                       template_name = value.get_string();
+                               }
                        }
                }
 


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