summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-19 11:34:01 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-19 11:34:01 +0000
commit25d0c8d4ad9132e2d68cd481c5c669b4b00ed638 (patch)
tree05e0e2a22fc3d00aa7a75ea749e3e135a4cc5978
parentd512e5b671300779b9ad738d71160e0562cfc76e (diff)
downloaddrakx-25d0c8d4ad9132e2d68cd481c5c669b4b00ed638.tar
drakx-25d0c8d4ad9132e2d68cd481c5c669b4b00ed638.tar.gz
drakx-25d0c8d4ad9132e2d68cd481c5c669b4b00ed638.tar.bz2
drakx-25d0c8d4ad9132e2d68cd481c5c669b4b00ed638.tar.xz
drakx-25d0c8d4ad9132e2d68cd481c5c669b4b00ed638.zip
always close the wizard_window, die when an exception has been raised
-rw-r--r--perl-install/printer/printerdrake.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 044cc0a7d..a99e2e023 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -4258,7 +4258,8 @@ sub add_printer {
return 1;
}
};
- wizard_close($in, 0) if $@ =~ /wizcancel/;
+ die if $@ && $@ !~ /^wizcancel/;
+ wizard_close($in, 0);
} else {
$printer->{expert} or $printer->{TYPE} = "LOCAL";
wizard_welcome($printer, $in, $upNetwork) or return 0;