X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28e0798fcdffb5233097060f7d43ffa01df7271d..9b95e87cb00a02e8373d25f525910d689c176ce4:/src/common/xlocale.cpp

diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index f66b2ab71a..96c8a558ca 100644
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -276,22 +276,22 @@ int wxToupper_l(const wxUniChar& c, const wxXLocale& loc)
              case !wxHAS_XLOCALE_SUPPORT...
 */
 
+/*
+    Note that this code is similar to (a portion of) wxLocale::IsAvailable code
+*/
 #define IMPLEMENT_STRTOX_L_START                                \
     wxCHECK(loc.IsOk(), 0);                                     \
                                                                 \
-    /* (Try to) temporary set the locale to 'C' */              \
-    const char *oldLocale = wxSetlocale(LC_NUMERIC, "");        \
-    const char *tmp = wxSetlocale(LC_NUMERIC, "C");             \
-    if ( !tmp )                                                 \
+    /* (Try to) temporary set the 'C' locale */                 \
+    const char *oldLocale = wxSetlocale(LC_NUMERIC, "C");       \
+    if ( !oldLocale )                                           \
     {                                                           \
-        /* restore the original locale */                       \
-        wxSetlocale(LC_NUMERIC, oldLocale);                     \
+        /* the current locale was not changed; no need to */    \
+        /* restore the previous one... */                       \
         errno = EINVAL;                                         \
             /* signal an error (better than nothing) */         \
         return 0;                                               \
-    }                                                           \
-                                                                \
-
+    }
 
 #define IMPLEMENT_STRTOX_L_END                                  \
     /* restore the original locale */                           \