diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-03-25 15:40:06 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-03-25 15:40:06 +0000 |
| commit | 85f1ea414035c750e76ce778077b3e51856712f8 (patch) | |
| tree | dfdb4d209fda1555ff7cb7cc049236bbaa5fa0e8 | |
| parent | 04d43bf1831c7c33e2522c4a9276e5b7d65f44da (diff) | |
| download | drakx-85f1ea414035c750e76ce778077b3e51856712f8.tar drakx-85f1ea414035c750e76ce778077b3e51856712f8.tar.gz drakx-85f1ea414035c750e76ce778077b3e51856712f8.tar.bz2 drakx-85f1ea414035c750e76ce778077b3e51856712f8.tar.xz drakx-85f1ea414035c750e76ce778077b3e51856712f8.zip | |
( _create_Window) do not run main_quit if not in a main loop (eg:
while loading GUI) but block window deletion instead (#39230)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/mygtk2.pm | 7 |
2 files changed, 8 insertions, 1 deletions
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; + } } }); |