summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-15 14:45:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-15 14:45:31 +0000
commitd39255057b45b1d14e58576354176602d480e1a5 (patch)
tree689c257fd6e555205eb61384f5a73b7ee2c9b5bb
parentd9e52e709f9380061d8815f9f9269cd6f18dfa00 (diff)
downloaddrakx-d39255057b45b1d14e58576354176602d480e1a5.tar
drakx-d39255057b45b1d14e58576354176602d480e1a5.tar.gz
drakx-d39255057b45b1d14e58576354176602d480e1a5.tar.bz2
drakx-d39255057b45b1d14e58576354176602d480e1a5.tar.xz
drakx-d39255057b45b1d14e58576354176602d480e1a5.zip
makes cancel on mouse selection works even better
-rw-r--r--perl-install/install_steps_gtk.pm2
-rw-r--r--perl-install/install_steps_interactive.pm1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 471e322fe..088f3b0ba 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -181,7 +181,7 @@ sub selectInstallClass1 {
sub selectMouse {
my ($o, $force) = @_;
my %old = %{$o->{mouse}};
- $o->SUPER::selectMouse($force);
+ $o->SUPER::selectMouse($force) or return;
my $mouse = $o->{mouse};
$mouse->{type} eq 'none' ||
$old{type} eq $mouse->{type} &&
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 30c26c283..e53ec8c5b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -250,6 +250,7 @@ sub selectMouse {
} if $o->{mouse}{device} eq "usbmouse";
$o->SUPER::selectMouse;
+ 1;
}
#------------------------------------------------------------------------------
sub setupSCSI {