summaryrefslogtreecommitdiffstats
path: root/perl-install
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 23:04:42 +0200
commitaeda3f38b3235dc2f60fd144b32561f746b544aa (patch)
treeea1c8f7d84233ff5e8a2b8bd80903ca4c8b06f92 /perl-install
parent99a108889f87676a426838033f212be4a51eae67 (diff)
downloaddrakx-aeda3f38b3235dc2f60fd144b32561f746b544aa.tar
drakx-aeda3f38b3235dc2f60fd144b32561f746b544aa.tar.gz
drakx-aeda3f38b3235dc2f60fd144b32561f746b544aa.tar.bz2
drakx-aeda3f38b3235dc2f60fd144b32561f746b544aa.tar.xz
drakx-aeda3f38b3235dc2f60fd144b32561f746b544aa.zip
fix crash on clicking Cancel after TZ selection (mga#13534)
Conflicts: perl-install/NEWS
Diffstat (limited to 'perl-install')
-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 60c3ecbe7..117865570 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.26.8 - 4 February 2014
- harddrake:
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";