[Goodies-commits] r3213 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-09-12 20:15:45 +0000 (Wed, 12 Sep 2007)
New Revision: 3213

Modified:
   ristretto/trunk/src/main.c
Log:
Fix segfault



Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c	2007-09-12 20:08:14 UTC (rev 3212)
+++ ristretto/trunk/src/main.c	2007-09-12 20:15:45 UTC (rev 3213)
@@ -194,6 +194,7 @@
     gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_separator);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_close);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_quit);
+    gtk_widget_set_sensitive(menu_item_close, FALSE);
     
     GtkWidget *recent_chooser_menu = gtk_recent_chooser_menu_new_for_manager(GTK_RECENT_MANAGER(recent_manager));
     GtkRecentFilter *filter = gtk_recent_filter_new();
@@ -405,6 +406,7 @@
             {
                 RsttoNavigatorEntry *entry = rstto_navigator_entry_new(info);
                 rstto_navigator_add (navigator, entry);
+                gtk_widget_set_sensitive(menu_item_close, TRUE);
             }
             else
             {
@@ -422,6 +424,7 @@
                         {
                             RsttoNavigatorEntry *entry = rstto_navigator_entry_new(file_info);
                             rstto_navigator_add (navigator, entry);
+                            gtk_widget_set_sensitive(menu_item_close, TRUE);
                         }
                         g_free(file_media);
                         thunar_vfs_path_unref(file_path);
@@ -1074,10 +1077,17 @@
 cb_rstto_close_current(GtkWidget *item, RsttoNavigator *navigator)
 {
     RsttoNavigatorEntry *entry = rstto_navigator_get_file(navigator);
-    rstto_navigator_remove(navigator, entry);    
-    rstto_navigator_entry_free(entry);
-    if (rstto_navigator_get_n_files(navigator) == 0)
+    if (entry)
     {
+        rstto_navigator_remove(navigator, entry);    
+        rstto_navigator_entry_free(entry);
+        if (rstto_navigator_get_n_files(navigator) == 0)
+        {
+            gtk_widget_set_sensitive(item, FALSE);
+        }
+    }
+    else
+    {
         gtk_widget_set_sensitive(item, FALSE);
     }
 }