From bdc787b62bee29700b4d19216a7e859f61096386 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 30 Aug 2020 21:14:14 +0200
Subject: [PATCH] restart after 1.9.x migration

---
 lib/framework/FSPersistence.h | 7 +++++++
 src/system.cpp                | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/lib/framework/FSPersistence.h b/lib/framework/FSPersistence.h
index a7176e8dc..e80002073 100644
--- a/lib/framework/FSPersistence.h
+++ b/lib/framework/FSPersistence.h
@@ -31,6 +31,12 @@ class FSPersistence {
             DeserializationError error        = deserializeJson(jsonDocument, settingsFile);
             if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
                 JsonObject jsonObject = jsonDocument.as<JsonObject>();
+
+                // debug added by Proddy
+                // Serial.printf("Read File: %s: ", _filePath);
+                // serializeJson(jsonDocument, Serial);
+                // Serial.println();
+
                 _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
                 settingsFile.close();
                 return;
@@ -57,6 +63,7 @@ class FSPersistence {
             return false;
         }
 
+        // debug added by Proddy
         // Serial.printf("Write File: %s: ", _filePath);
         // serializeJson(jsonDocument, Serial);
         // Serial.println();
diff --git a/src/system.cpp b/src/system.cpp
index beec9d28f..59842bd21 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -717,7 +717,9 @@ bool System::check_upgrade() {
         },
         "local");
 
+    Serial.println(F("Restarting..."));
     Serial.end();
+    restart(); // force a restart, nice and tidy
     return true;
 #else
     return false;