summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-19 10:29:20 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-19 10:29:20 +0000
commitd5d933560ce61ee81c6fbd1f73b1c3bc6bf01aad (patch)
tree901db9548a1caed4f5d663b8e87990c5447f1fb3
parenta6a1fbd0cd09b7127e11b8de53d9f30db9d31c1c (diff)
downloaddrakx-d5d933560ce61ee81c6fbd1f73b1c3bc6bf01aad.tar
drakx-d5d933560ce61ee81c6fbd1f73b1c3bc6bf01aad.tar.gz
drakx-d5d933560ce61ee81c6fbd1f73b1c3bc6bf01aad.tar.bz2
drakx-d5d933560ce61ee81c6fbd1f73b1c3bc6bf01aad.tar.xz
drakx-d5d933560ce61ee81c6fbd1f73b1c3bc6bf01aad.zip
(create_widget) fix crashing in r244088 (regression introduced in when moving
advanced widgets in their own dialog instead of in another block child of an expander)
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/interactive/gtk.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 64b5db04c..81a09936f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- fix crash with advanced widgets
+- fix crashing on some buttons
- fix bogus popup of 'desktop choice' dialog
- authentication: enable network-auth meta-service if auth is not local
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 1bf642e47..5df2d1c4d 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -396,7 +396,7 @@ sub create_widget {
} elsif ($e->{type} eq 'button') {
$w = Gtk2::Button->new_with_label('');
$w->signal_connect(clicked => $e->{clicked_may_quit_cooked});
- $set = sub { $w->child->set_label(may_apply($e->{format}, $_[0])) };
+ $set = sub { $w->child && $w->child->set_label(may_apply($e->{format}, $_[0])) };
} elsif ($e->{type} eq 'range') {
my $adj = Gtk2::Adjustment->new(${$e->{val}}, $e->{min}, $e->{max} + ($e->{SpinButton} ? 0 : 1), 1, ($e->{max} - $e->{min}) / 10, 1);
$w = $e->{SpinButton} ? Gtk2::SpinButton->new($adj, 10, 0) : Gtk2::HScale->new($adj);