#225 Fixed: Filters: 'Cancel' button when adding a folder does not work.

teejee2008 · Jun 24, 2018 · 6ab93e4 · 6ab93e4
1 parent b260c8d
commit 6ab93e4
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/Gtk/ExcludeBox.vala b/src/Gtk/ExcludeBox.vala
@@ -399,6 +399,8 @@ class ExcludeBox : Gtk.Box{
 	}
 
 	private SList<string> browse_files(){
+
+		var list = new SList<string>();
 
 		var dialog = new Gtk.FileChooserDialog(
 			_("Select file(s)"), parent_window,
@@ -412,14 +414,20 @@ class ExcludeBox : Gtk.Box{
  		dialog.set_modal (true);
  		dialog.set_select_multiple (true);
 
-		dialog.run();
-		var list = dialog.get_filenames();
-	 	dialog.destroy ();
+		var resp = dialog.run();
+
+		if (resp != Gtk.ResponseType.CANCEL){
+			list = dialog.get_filenames();
+		}
+
+		dialog.destroy();
 
 	 	return list;
 	}
 
 	private SList<string> browse_folder(){
+
+		var list = new SList<string>();
 
 		var dialog = new Gtk.FileChooserDialog(
 			_("Select directory"), parent_window,
@@ -433,9 +441,13 @@ class ExcludeBox : Gtk.Box{
  		dialog.set_modal (true);
  		dialog.set_select_multiple (false);
 
-		dialog.run();
-		var list = dialog.get_filenames();
-	 	dialog.destroy ();
+		var resp = dialog.run();
+
+		if (resp != Gtk.ResponseType.CANCEL){
+			list = dialog.get_filenames();
+		}
+
+		dialog.destroy();
 
 	 	return list;
 	}