Merge pull request #38 from jsuchome/master

- do not try to save settings when user did not change them
yast · Apr 23, 2014 · 797b45c · 797b45c
2 parents b86928a + 035a79c
commit 797b45c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 23 08:59:09 CEST 2014 - jsuchome@suse.cz
+
+- do not try to save settings when user did not change them
+  (bnc#850571)
+- 3.1.9
+
 -------------------------------------------------------------------
 Thu Apr 10 09:41:15 UTC 2014 - mvidner@suse.com
 

diff --git a/package/yast2-country.spec b/package/yast2-country.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-country
-Version:        3.1.8
+Version:        3.1.9
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/timezone/src/include/timezone/dialogs.rb b/timezone/src/include/timezone/dialogs.rb
@@ -973,7 +973,7 @@ def TimezoneDialog(args)
             changed_time = true if timezone != timezone_old
             timezone_old = timezone
             hwclock_s_old = @hwclock_s
-            SetTimezone(@hwclock_s, timezone, ret == :next, changed_time)
+            SetTimezone(@hwclock_s, timezone, ret == :next && (changed_time || @hwclock_s != @hwclock_s_initial), changed_time)
           end
 
           if ret == :next