From: Thomas Faber <thomas.faber@reactos.org>
Date: Sun, 6 Jan 2013 11:37:11 +0000 (+0000)
Subject: [TIMEDATE]
X-Git-Tag: backups/ros-csrss@60644~85^2~25
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=d655fccbd29dc8914b98be184446eec87e623d00

[TIMEDATE]
- Correctly show current time zone name even if no daylight saving settings are set. Patch by Lee Schroeder.
CORE-6803 #resolve #comment Fixed, thanks. Sorry for the long wait.

svn path=/trunk/; revision=58126
---

diff --git a/reactos/dll/cpl/timedate/dateandtime.c b/reactos/dll/cpl/timedate/dateandtime.c
index f82ab7a1511..d74f7496d2b 100644
--- a/reactos/dll/cpl/timedate/dateandtime.c
+++ b/reactos/dll/cpl/timedate/dateandtime.c
@@ -123,6 +123,7 @@ SetTimeZoneName(HWND hwnd)
     switch (TimeZoneId)
     {
         case TIME_ZONE_ID_STANDARD:
+        case TIME_ZONE_ID_UNKNOWN:
             wcscpy(TimeZoneName, TimeZoneInfo.StandardName);
             break;
 
@@ -130,10 +131,6 @@ SetTimeZoneName(HWND hwnd)
             wcscpy(TimeZoneName, TimeZoneInfo.DaylightName);
             break;
 
-        case TIME_ZONE_ID_UNKNOWN:
-            LoadStringW(hApplet, IDS_TIMEZONEUNKNOWN, TimeZoneName, 128);
-            break;
-
         case TIME_ZONE_ID_INVALID:
         default:
             LoadStringW(hApplet, IDS_TIMEZONEINVALID, TimeZoneName, 128);