From d55fa70f6c5e3b2212e2eba7d9d97141efe3a4c4 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 20 Jun 2014 09:30:04 +0200
Subject: fix loosing TZ choice when canceling TZ selection (mga#13534)

---
 perl-install/NEWS                 | 1 +
 perl-install/standalone/drakclock | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 588833081..87a7ef82b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - drakclock:
   o fix crash on clicking "Cancel" after TZ selection (mga#13534)
+  o fix loosing TZ choice when canceling TZ selection (mga#13534)
 
 Version 16.33 - 18 June 2014
 
diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
index 87820c9d4..4206a11be 100755
--- a/perl-install/standalone/drakclock
+++ b/perl-install/standalone/drakclock
@@ -42,7 +42,8 @@ my @timezones = eval { timezone::getTimeZones() };
 my $err = $@;
 $button_time->signal_connect(clicked => sub {
     local $::isEmbedded = 0; # to prevent sub window embedding
-    if ($timezone->{timezone} = $in->ask_from_treelist(N("Timezone - DrakClock"), N("Which is your timezone?"), '/', \@timezones, $timezone->{timezone})) {
+    if (my $tz = $in->ask_from_treelist(N("Timezone - DrakClock"), N("Which is your timezone?"), '/', \@timezones, $timezone->{timezone})) {
+	$timezone->{timezone} = $tz;
 	$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});
-- 
cgit v1.2.1