summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-06 18:26:14 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-06 18:26:14 +0000
commit668e507b646f0f71d06ba16be7b60a4cc4f93db6 (patch)
tree15aab2d129c05533115b6590204cd373d4721706
parent05c9f7b0b35b9752edc8053178634df509a70ee9 (diff)
downloadcontrol-center-668e507b646f0f71d06ba16be7b60a4cc4f93db6.tar
control-center-668e507b646f0f71d06ba16be7b60a4cc4f93db6.tar.gz
control-center-668e507b646f0f71d06ba16be7b60a4cc4f93db6.tar.bz2
control-center-668e507b646f0f71d06ba16be7b60a4cc4f93db6.tar.xz
control-center-668e507b646f0f71d06ba16be7b60a4cc4f93db6.zip
make cancel (while tool is starting) button work again
-rwxr-xr-xcontrol-center4
1 files changed, 3 insertions, 1 deletions
diff --git a/control-center b/control-center
index 72a72394..82e7134d 100755
--- a/control-center
+++ b/control-center
@@ -510,7 +510,7 @@ gtkadd($window_global,
0, Gtk2::Label->new(N("Please wait...")),
1, Gtk2::HBox->new(0, 0),
0, gtkadd(gtkset_layout(gtkset_border_width(Gtk2::HButtonBox->new, 10), 'end'),
- gtksignal_connect(Gtk2::Button->new_from_stock(N("Cancel")), clicked => sub { Glib::Source->remove($timeout) if $timeout; &child_just_exited() }),
+ gtksignal_connect(Gtk2::Button->new_from_stock(N("Cancel")), clicked => sub { Glib::Source->remove($timeout) if $timeout; kill_children(); child_just_exited() }),
),
),
),
@@ -741,6 +741,8 @@ sub child_just_exited() {
$emb_socket->destroy;
undef $emb_socket;
}
+ $emb_frame->hide;
+ $emb_wait->hide;
gtkset_mousecursor_normal();
foreach my $notebook ($notebook_global, $banner_notebook) {
$notebook->show;