diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-06-20 09:30:04 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-06-20 23:04:51 +0200 |
| commit | 38acef524421072eb1e4ddb589335db44c268400 (patch) | |
| tree | 577fe958914774c7d9bd4b926bdb9f881043d987 | |
| parent | aeda3f38b3235dc2f60fd144b32561f746b544aa (diff) | |
| download | drakx-38acef524421072eb1e4ddb589335db44c268400.tar drakx-38acef524421072eb1e4ddb589335db44c268400.tar.gz drakx-38acef524421072eb1e4ddb589335db44c268400.tar.bz2 drakx-38acef524421072eb1e4ddb589335db44c268400.tar.xz drakx-38acef524421072eb1e4ddb589335db44c268400.zip | |
fix loosing TZ choice when canceling TZ selection (mga#13534)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rwxr-xr-x | perl-install/standalone/drakclock | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 117865570..d49be55fa 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.26.8 - 4 February 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}); |