[gthumb] find duplicates: fixed crash when using a predefined directory



commit c5e979fce74cf6387604efbb62754aa5cfc96579
Author: Christian Krause <chkr plauener de>
Date:   Sat Aug 24 09:31:34 2013 +0200

    find duplicates: fixed crash when using a predefined directory
    
    [bug #706697]

 extensions/find_duplicates/dlg-find-duplicates.c |    5 ++++-
 extensions/find_duplicates/gth-find-duplicates.c |    2 ++
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/extensions/find_duplicates/dlg-find-duplicates.c 
b/extensions/find_duplicates/dlg-find-duplicates.c
index 4df5a2d..7e48717 100644
--- a/extensions/find_duplicates/dlg-find-duplicates.c
+++ b/extensions/find_duplicates/dlg-find-duplicates.c
@@ -63,7 +63,10 @@ ok_clicked_cb (GtkWidget  *widget,
 {
        GFile *folder;
 
-       folder = gtk_file_chooser_get_current_folder_file (GTK_FILE_CHOOSER ( _gtk_builder_get_widget 
(data->builder, "location_filechooserbutton")));
+       folder = gtk_file_chooser_get_file (GTK_FILE_CHOOSER ( _gtk_builder_get_widget (data->builder, 
"location_filechooserbutton")));
+       if (folder == NULL)
+               return;
+
        gth_find_duplicates_exec (data->browser,
                                  folder,
                                  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET 
("include_subfolder_checkbutton"))),
diff --git a/extensions/find_duplicates/gth-find-duplicates.c 
b/extensions/find_duplicates/gth-find-duplicates.c
index f073dba..e0fa2a0 100644
--- a/extensions/find_duplicates/gth-find-duplicates.c
+++ b/extensions/find_duplicates/gth-find-duplicates.c
@@ -1270,6 +1270,8 @@ gth_find_duplicates_exec (GthBrowser *browser,
        const char        *test_attributes;
        int                i;
 
+       g_return_if_fail (location != NULL);
+
        self = (GthFindDuplicates *) g_object_new (GTH_TYPE_FIND_DUPLICATES, NULL);
 
        settings = g_settings_new (GTHUMB_BROWSER_SCHEMA);


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