summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-06-20 09:28:52 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-06-20 09:28:52 +0200
commit2d150597360738d6fdecd24a21d4ce076469b1df (patch)
tree1e911eff059c2456a1b6cc7157017ba3a88f3e23
parent05bb76e87d8c08d30ae6bf69c86bc7572fa7c9b9 (diff)
downloaddrakx-2d150597360738d6fdecd24a21d4ce076469b1df.tar
drakx-2d150597360738d6fdecd24a21d4ce076469b1df.tar.gz
drakx-2d150597360738d6fdecd24a21d4ce076469b1df.tar.bz2
drakx-2d150597360738d6fdecd24a21d4ce076469b1df.tar.xz
drakx-2d150597360738d6fdecd24a21d4ce076469b1df.zip
fix crash on clicking Cancel after TZ selection (mga#13534)
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/drakclock2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index b1f9ea3cb..588833081 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakclock:
+ o fix crash on clicking "Cancel" after TZ selection (mga#13534)
+
Version 16.33 - 18 June 2014
- stop creating some /dev entries that are managed by udev
diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
index 7b64ed508..87820c9d4 100755
--- a/perl-install/standalone/drakclock
+++ b/perl-install/standalone/drakclock
@@ -45,8 +45,8 @@ $button_time->signal_connect(clicked => sub {
if ($timezone->{timezone} = $in->ask_from_treelist(N("Timezone - DrakClock"), N("Which is your timezone?"), '/', \@timezones, $timezone->{timezone})) {
$timezone->{UTC} = $in->ask_yesorno(N("GMT - DrakClock"), N("Is your hardware clock set to GMT?"), $timezone->{UTC});
timezone::write($timezone);
+ $label_timezone->set_text($timezone->{timezone});
}
- $label_timezone->set_text($timezone->{timezone});
});
if (!@timezones) {
warn "Failed to retrieve timezone list: $err\n";