From 6e982acde8f7953ff11b8ce911bb6e49c8de430b Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Fri, 28 Oct 2022 10:50:51 +0200
Subject: [PATCH] v3.4.4 Fix for new installations with filesystem not
 initializing

---
 CHANGELOG.md                  |  6 ++++++
 lib/framework/FSPersistence.h | 20 ++++++++++----------
 src/version.h                 |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e81334aff..449bab6ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [3.4.4]
+
+## Fixed
+
+- Fix for new installations with filesystem not initializing
+
 # [3.4.3]
 
 ## Fixed
diff --git a/lib/framework/FSPersistence.h b/lib/framework/FSPersistence.h
index 688f1c231..49e13f468 100644
--- a/lib/framework/FSPersistence.h
+++ b/lib/framework/FSPersistence.h
@@ -68,6 +68,16 @@ class FSPersistence {
         JsonObject          jsonObject   = jsonDocument.to<JsonObject>();
         _statefulService->read(jsonObject, _stateReader);
 
+        // make directories if required, for new IDF4.2 & LittleFS
+        String path(_filePath);
+        int    index = 0;
+        while ((index = path.indexOf('/', index + 1)) != -1) {
+            String segment = path.substring(0, index);
+            if (!_fs->exists(segment)) {
+                _fs->mkdir(segment);
+            }
+        }
+
         // serialize it to filesystem
         File settingsFile = _fs->open(_filePath, "w");
 
@@ -85,16 +95,6 @@ class FSPersistence {
 #endif
 #endif
 
-        // make directories if required, for new IDF4.2 & LittleFS
-        String path(_filePath);
-        int    index = 0;
-        while ((index = path.indexOf('/', index + 1)) != -1) {
-            String segment = path.substring(0, index);
-            if (!_fs->exists(segment)) {
-                _fs->mkdir(segment);
-            }
-        }
-
         // serialize the data to the file
         serializeJson(jsonDocument, settingsFile);
         settingsFile.close();
diff --git a/src/version.h b/src/version.h
index c1dc7ea49..84caf8bbf 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.4.3"
+#define EMSESP_APP_VERSION "3.4.4"