Fix misdetection of incorrect timezones

tidyverse · Feb 22, 2018 · 04cf969 · 04cf969
1 parent f2b1bf5
commit 04cf969
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/update.cpp b/src/update.cpp
@@ -116,7 +116,7 @@ bool load_tz(std::string tzstr, cctz::time_zone& tz) {
   if (tzstr.size() == 0) {
     // CCTZ doesn't work on windows https://github.com/google/cctz/issues/53
     /* std::cout << "Local TZ: " << local_tz() << std::endl; */
-    cctz::load_time_zone(local_tz(), &tz);
+    return cctz::load_time_zone(local_tz(), &tz);
   } else {
     if (!cctz::load_time_zone(tzstr, &tz)) {
       auto el = TZMAP.find(tzstr);
@@ -126,8 +126,8 @@ bool load_tz(std::string tzstr, cctz::time_zone& tz) {
         return false;
       }
     }
+    return true;
   }
-  return true;
 }
 
 // [[Rcpp::export]]