Fixed an issue where the application shutdown was not always clean

es-app/src/main.cpp

@@ -873,6 +873,7 @@ int main(int argc, char* argv[])
         delete window->peekGui();
     window->deinit();
 
+    TextureResource::setExit();
     CollectionSystemsManager::getInstance()->deinit(true);
     SystemData::deleteSystems();
     NavigationSounds::getInstance().deinit();

es-core/src/resources/TextureDataManager.cpp

@@ -177,7 +177,7 @@ void TextureLoader::threadProc()
             }
         }
         // Queue has been released here but we might have a texture to process.
-        while (textureData) {
+        while (!mExit && textureData) {
             textureData->load();
 
             // See if there is another item in the queue.

es-core/src/resources/TextureDataManager.h

@@ -29,6 +29,7 @@ public:
     void load(std::shared_ptr<TextureData> textureData);
     void remove(std::shared_ptr<TextureData> textureData);
 
+    void setExit() { mExit = true; }
     size_t getQueueSize();
 
 private:
@@ -83,6 +84,12 @@ public:
     size_t getQueueSize();
     // Load a texture, freeing resources as necessary to make space.
     void load(std::shared_ptr<TextureData> tex, bool block = false);
+    // Make sure that threadProc() does not continue to run during application shutdown.
+    void setExit()
+    {
+        if (mLoader)
+            mLoader->setExit();
+    }
 
 private:
     std::list<std::shared_ptr<TextureData>> mTextures;

es-core/src/resources/TextureResource.h

@@ -80,6 +80,8 @@ public:
     // Returns the number of bytes that would be used if all textures were in memory.
     static size_t getTotalTextureSize();
 
+    static void setExit() { sTextureDataManager.setExit(); }
+
 protected:
     TextureResource(const std::string& path,
                     float tileWidth,