Don't poll wifi information from database while db save is in progress.

caerffili · Mar 12, 2018 · 08eeb11 · 08eeb11
1 parent 0fc7b01
commit 08eeb11
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/database.cpp b/database.cpp
@@ -303,6 +303,8 @@ static int sqliteLoadConfigCallback(void *user, int ncols, char **colval , char
         return 0;
     }
 
+    DBG_Printf(DBG_INFO_L2, "Load config from db.\n");
+
     bool ok;
     DeRestPluginPrivate *d = static_cast<DeRestPluginPrivate*>(user);
 

diff --git a/de_web_plugin.cpp b/de_web_plugin.cpp
@@ -12494,6 +12494,12 @@ void DeRestPluginPrivate::pollSwUpdateStateTimerFired()
 
 void DeRestPluginPrivate::pollDatabaseWifiTimerFired()
 {
+    if (saveDatabaseItems & DB_CONFIG)
+    {
+        DBG_Printf(DBG_INFO_L2, "Don't read wifi from db. Db save still in progress.\n");
+        return;
+    }
+
     openDb();
     loadWifiInformationFromDb();
     closeDb();