From 85f1ea414035c750e76ce778077b3e51856712f8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 25 Mar 2008 15:40:06 +0000 Subject: ( _create_Window) do not run main_quit if not in a main loop (eg: while loading GUI) but block window deletion instead (#39230) --- perl-install/NEWS | 2 ++ perl-install/mygtk2.pm | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 2a297d29c..81e278ee4 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- do not run main_quit if not in a main loop (eg: while loading GUI) + but block window deletion instead (#39230) - diskdrake --nfs o ensure "nfs-common" is started (#34103) - adduserdrake diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index 437112054..9c2d100ca 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -948,7 +948,12 @@ sub _create_Window { $w->destroy; die 'wizcancel'; } else { - Gtk2->main_quit; + if (Gtk2->main_level) { + Gtk2->main_quit; + } else { + # block window deletion if not in main loop (eg: while starting the GUI) + return 1; + } } }); -- cgit v1.2.1