From 0e6db6397ce42a97eec1aac7288c9aeb751245b4 Mon Sep 17 00:00:00 2001 From: "J. Robert Magyar II" Date: Sat, 5 Dec 2015 10:34:30 -0600 Subject: [PATCH 1/2] x button now closes import file menu --- gramps/gui/dbloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gramps/gui/dbloader.py b/gramps/gui/dbloader.py index 4d46f4ad0..dd152992b 100644 --- a/gramps/gui/dbloader.py +++ b/gramps/gui/dbloader.py @@ -168,7 +168,7 @@ class DbLoader(CLIDbLoader): import_dialog.set_current_folder(default_dir) while True: response = import_dialog.run() - if response == Gtk.ResponseType.CANCEL: + if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT): break elif response == Gtk.ResponseType.OK: filename = conv_to_unicode(import_dialog.get_filename()) From 536cc48d85e806fed2d35c463a67a97a177226d8 Mon Sep 17 00:00:00 2001 From: "J. Robert Magyar II" Date: Sat, 5 Dec 2015 10:34:30 -0600 Subject: [PATCH 2/2] x button now closes import file menu --- gramps/gui/dbloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gramps/gui/dbloader.py b/gramps/gui/dbloader.py index 4d46f4ad0..dd152992b 100644 --- a/gramps/gui/dbloader.py +++ b/gramps/gui/dbloader.py @@ -168,7 +168,7 @@ class DbLoader(CLIDbLoader): import_dialog.set_current_folder(default_dir) while True: response = import_dialog.run() - if response == Gtk.ResponseType.CANCEL: + if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT): break elif response == Gtk.ResponseType.OK: filename = conv_to_unicode(import_dialog.get_filename())