NTP fix

eez-open · Jun 19, 2017 · 8592400 · 8592400
1 parent c9d089e
commit 8592400
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/eez_psu_sketch/ntp.cpp b/eez_psu_sketch/ntp.cpp
@@ -70,7 +70,7 @@ const char *getNtpServer() {
             return g_ntpServerToTest;
         }
     } else {
-        if (persist_conf::isNtpEnabled() && persist_conf::devConf2.ntpServer[0]) {
+        if (persist_conf::devConf2.ntpServer[0]) {
             return persist_conf::devConf2.ntpServer;
         }
     }
@@ -175,7 +175,7 @@ void begin() {
 }
 
 void init() {
-    if (ethernet::g_testResult == TEST_OK && persist_conf::isNtpEnabled() && persist_conf::devConf2.ntpServer[0]) {
+    if (ethernet::g_testResult == TEST_OK && persist_conf::isNtpEnabled()) {
         begin();
     }
 }
@@ -194,7 +194,7 @@ void setState(State state) {
 }
 
 void tick(uint32_t tickCount) {
-    if (ethernet::g_testResult == TEST_OK) {
+    if (ethernet::g_testResult == TEST_OK && persist_conf::isNtpEnabled()) {
         if (g_state == STOPPED) {
             begin();
         }