diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-30 15:17:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-30 15:17:20 +0000 |
| commit | 3d9262a59e3a5c82d68d21ab60f9a2c3f188010e (patch) | |
| tree | 724c45fa614c4f7c27321ffcf69286bdb7435da3 | |
| parent | f93e37d668b075efaf7aec941285d6a54e8d2aa8 (diff) | |
| download | drakx-backup-do-not-use-3d9262a59e3a5c82d68d21ab60f9a2c3f188010e.tar drakx-backup-do-not-use-3d9262a59e3a5c82d68d21ab60f9a2c3f188010e.tar.gz drakx-backup-do-not-use-3d9262a59e3a5c82d68d21ab60f9a2c3f188010e.tar.bz2 drakx-backup-do-not-use-3d9262a59e3a5c82d68d21ab60f9a2c3f188010e.tar.xz drakx-backup-do-not-use-3d9262a59e3a5c82d68d21ab60f9a2c3f188010e.zip | |
network::netconnect::real_main() do not exit brutally on wizcancel, handle it in network::netconnect::main()
| -rw-r--r-- | perl-install/network/netconnect.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 97b8cfd55..5d2df0a9f 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -1376,7 +1376,7 @@ Click on Ok to keep your configuration, or cancel to reconfigure your Internet & mouse => $mouse, intf => $intf, }; - wizards->new->safe_process($wiz, $in); + wizards->new->process($wiz, $in); } # install needed packages: @@ -1391,7 +1391,9 @@ sub main { eval { real_main('', , $netcnx, $in, $modules_conf, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) }; my $err = $@; if ($err) { # && $in->isa('interactive::gtk') - local $::isEmbedded = 0; # to prevent sub window embedding + $err =~ /wizcancel/ and $in->exit(0); + + local $::isEmbedded = 0; # to prevent sub window embedding local $::isWizard = 0 if !$::isInstall; # to prevent sub window embedding #err_dialog(N("Error"), N("An unexpected error has happened:\n%s", $err)); $in->ask_warn(N("Error"), N("An unexpected error has happened:\n%s", $err)); |