InfiniTime.git

commit d6b4ef38f6c070dc27577ae371d3b0b86d5aec3b

Author: Jean-François Milants <jf@codingfield.com>

Infineat & G7710 : always close files when they are not needed anymore.

 src/displayapp/screens/WatchFaceCasioStyleG7710.cpp | 3 +++
 src/displayapp/screens/WatchFaceInfineat.cpp | 8 +++++---


diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
index 4ef2839cb5424ff7a4350f70e83ede3eece55db0..f9a01abde37168e5370cef1e433e07de8357683e 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -36,14 +36,17 @@     motionController {motionController} {
 
   lfs_file f = {};
   if (filesystem.FileOpen(&f, "/fonts/lv_font_dots_40.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_dot40 = lv_font_load("F:/fonts/lv_font_dots_40.bin");
   }
 
   if (filesystem.FileOpen(&f, "/fonts/7segments_40.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_segment40 = lv_font_load("F:/fonts/7segments_40.bin");
   }
 
   if (filesystem.FileOpen(&f, "/fonts/7segments_115.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_segment115 = lv_font_load("F:/fonts/7segments_115.bin");
   }
 




diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp
index e3ed1bf7964c919f8235f3f24072beec3d670195..ae3f3dbb36aebc1c3b5e2900f0391f3e0b796d27 100644
--- a/src/displayapp/screens/WatchFaceInfineat.cpp
+++ b/src/displayapp/screens/WatchFaceInfineat.cpp
@@ -27,7 +27,7 @@                                      Controllers::Ble& bleController,
                                      Controllers::NotificationManager& notificationManager,
                                      Controllers::Settings& settingsController,
                                      Controllers::MotionController& motionController,
-                                     Controllers::FS& fs)
+                                     Controllers::FS& filesystem)
   : Screen(app),
     currentDateTime {{}},
     dateTimeController {dateTimeController},
@@ -37,11 +37,13 @@     notificationManager {notificationManager},
     settingsController {settingsController},
     motionController {motionController} {
   lfs_file f = {};
-  if (fs.FileOpen(&f, "/fonts/teko.bin", LFS_O_RDONLY) >= 0) {
+  if (filesystem.FileOpen(&f, "/fonts/teko.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_teko = lv_font_load("F:/fonts/teko.bin");
   }
 
-  if (fs.FileOpen(&f, "/fonts/bebas.bin", LFS_O_RDONLY) >= 0) {
+  if (filesystem.FileOpen(&f, "/fonts/bebas.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_bebas = lv_font_load("F:/fonts/bebas.bin");
   }