diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-12-13 13:56:24 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-12-13 13:56:24 +0000 |
| commit | db470f779b0c7fc562f93a53975f819194a69e87 (patch) | |
| tree | f6c3a0891c907cc0550ef6f42f69e79b9df2be54 | |
| parent | b04f79db286bd863df7ff3ab776114361177ff4c (diff) | |
| download | drakx-db470f779b0c7fc562f93a53975f819194a69e87.tar drakx-db470f779b0c7fc562f93a53975f819194a69e87.tar.gz drakx-db470f779b0c7fc562f93a53975f819194a69e87.tar.bz2 drakx-db470f779b0c7fc562f93a53975f819194a69e87.tar.xz drakx-db470f779b0c7fc562f93a53975f819194a69e87.zip | |
(create_widget) fix quitting app when closing "advanced" dialog
(mga#1812)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index d73dd1e66..cc9498bfe 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- interactive layer: + o fix quitting app when closing "advanced" dialog (mga#1812) + Version 15.10 - 11 December 2012 - revert rosa crap that breaks generating initrd (mga#8357) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 74dbad3fc..881bfc7e2 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -442,7 +442,11 @@ sub create_widget { $w = gtknew('HBox', children_tight => [ gtknew('Install_Button', text => $e->{text}, clicked => sub { - ask_fromW($o, { title => $common->{advanced_title} || $common->{title} || N("Advanced") }, $children) } + eval { ask_fromW($o, { title => $common->{advanced_title} || $common->{title} || N("Advanced") }, $children) }; + if (my $err = $@) { + die $err if $err !~ /^wizcancel/; + } + } ) ]); } elsif ($e->{type} =~ /list/) { |