From 84279354e55b97d33dc76b7a66ffa2cc4d73530d Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Mon, 14 Mar 2022 10:45:19 -0700
Subject: [PATCH] `cleanup`: Don't `savestatsandsettings` if filesystem not
 init

This isn't necessary, but it does silence these annoying logs if you
pass an invalid argument or don't have data.zip:

    [ERROR] Could not get window size: Invalid renderer
    [WARN] Stats not loaded! Not writing unlock.vvv.
    [ERROR] Could not get window size: Invalid renderer
    [WARN] Settings not loaded! Not writing settings.vvv.

To do this, I've added FILESYSTEM_isInit().
---
 desktop_version/src/FileSystemUtils.cpp | 5 +++++
 desktop_version/src/FileSystemUtils.h   | 1 +
 desktop_version/src/main.cpp            | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp
index 0d352d57..8dd31bcc 100644
--- a/desktop_version/src/FileSystemUtils.cpp
+++ b/desktop_version/src/FileSystemUtils.cpp
@@ -186,6 +186,11 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath)
     return 1;
 }
 
+bool FILESYSTEM_isInit(void)
+{
+    return isInit;
+}
+
 static unsigned char* stdin_buffer = NULL;
 static size_t stdin_length = 0;
 
diff --git a/desktop_version/src/FileSystemUtils.h b/desktop_version/src/FileSystemUtils.h
index 40552726..bac5b444 100644
--- a/desktop_version/src/FileSystemUtils.h
+++ b/desktop_version/src/FileSystemUtils.h
@@ -10,6 +10,7 @@ class binaryBlob;
 namespace tinyxml2 { class XMLDocument; }
 
 int FILESYSTEM_init(char *argvZero, char* baseDir, char* assetsPath);
+bool FILESYSTEM_isInit(void);
 void FILESYSTEM_deinit(void);
 
 char *FILESYSTEM_getUserSaveDirectory(void);
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index 4591717b..39c52b41 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -697,7 +697,10 @@ int main(int argc, char *argv[])
 static void cleanup(void)
 {
     /* Order matters! */
-    game.savestatsandsettings();
+    if (FILESYSTEM_isInit()) /* not necessary but silences logs */
+    {
+        game.savestatsandsettings();
+    }
     gameScreen.destroy();
     graphics.grphx.destroy();
     graphics.destroy_buffers();