diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-09-23 11:01:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-09-23 11:01:31 +0000 |
| commit | 82ac911018f1e111fbf099ced7036e32f87d1b4b (patch) | |
| tree | acbd1ecc599a02b0f04906d81bfdfa443680c094 | |
| parent | f9f7db06b6c13cd6dc3bf8559dd8dbf936882234 (diff) | |
| download | drakx-82ac911018f1e111fbf099ced7036e32f87d1b4b.tar drakx-82ac911018f1e111fbf099ced7036e32f87d1b4b.tar.gz drakx-82ac911018f1e111fbf099ced7036e32f87d1b4b.tar.bz2 drakx-82ac911018f1e111fbf099ced7036e32f87d1b4b.tar.xz drakx-82ac911018f1e111fbf099ced7036e32f87d1b4b.zip | |
ensure ->kill kills all the open windows
(fixes mke2fs failure causing $::WizardTable to be kept empty)
| -rw-r--r-- | perl-install/interactive/gtk.pm | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 88b110171..e348271f1 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -752,15 +752,9 @@ sub wait_message_endW { } sub kill { - my ($o) = @_; - $o->{before_killing} ||= 0; - - while (my $e = shift @tempory::objects) { $e->destroy } - while (@interactive::objects > $o->{before_killing}) { - my $w = pop @interactive::objects; - $w->destroy; - } - $o->{before_killing} = @interactive::objects; + my ($_o) = @_; + $_->destroy foreach $::WizardTable ? $::WizardTable->get_children : (), @tempory::objects, @interactive::objects; + @tempory::objects = @interactive::objects = (); } sub ok { |