diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-03-25 15:52:48 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-03-25 15:52:48 +0000 |
| commit | 8049dd060ce225bcbf83872516318d6f32aac5a5 (patch) | |
| tree | 22320939c5b043224820291a66a10c02b60942c0 | |
| parent | 77fb2079808ad245f24267692aec0a02fa1a25a8 (diff) | |
| download | drakx-backup-do-not-use-8049dd060ce225bcbf83872516318d6f32aac5a5.tar drakx-backup-do-not-use-8049dd060ce225bcbf83872516318d6f32aac5a5.tar.gz drakx-backup-do-not-use-8049dd060ce225bcbf83872516318d6f32aac5a5.tar.bz2 drakx-backup-do-not-use-8049dd060ce225bcbf83872516318d6f32aac5a5.tar.xz drakx-backup-do-not-use-8049dd060ce225bcbf83872516318d6f32aac5a5.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 4fe7b7178..9c72b6ba8 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) - draksec o do not continue if installing msec crashed or was canceled (#38911) - localdrake: diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index f218b4e66..896825811 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -913,7 +913,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; + } } }); |