Fix null cache crashes.

acolwell · Aug 5, 2024 · 72f7d9d · 72f7d9d
1 parent 687002a
commit 72f7d9d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Engine/AppManager.cpp b/Engine/AppManager.cpp
@@ -457,9 +457,15 @@ AppManager::~AppManager()
     QThreadPool::globalInstance()->waitForDone();
 
     ///Kill caches now because decreaseNCacheFilesOpened can be called
-    _imp->_nodeCache->waitForDeleterThread();
-    _imp->_diskCache->waitForDeleterThread();
-    _imp->_viewerCache->waitForDeleterThread();
+    if (_imp->_nodeCache) {
+        _imp->_nodeCache->waitForDeleterThread();
+    }
+    if (_imp->_diskCache) {
+        _imp->_diskCache->waitForDeleterThread();
+    }
+    if (_imp->_viewerCache) {
+        _imp->_viewerCache->waitForDeleterThread();
+    }
     _imp->_nodeCache.reset();
     _imp->_viewerCache.reset();
     _imp->_diskCache.reset();

diff --git a/Engine/AppManagerPrivate.cpp b/Engine/AppManagerPrivate.cpp
@@ -448,6 +448,10 @@ template <typename T>
 void
 saveCache(Cache<T>* cache)
 {
+    if (!cache) {
+        return;
+    }
+
     std::string cacheRestoreFilePath = cache->getRestoreFilePath();
     FStreamsSupport::ofstream ofile;
     FStreamsSupport::open(&ofile, cacheRestoreFilePath);