Merge pull request #1147 from letsfindaway/fix-crash-background-loading

fix: crash when closing while scene is loading
OpenBoard-org · Oct 28, 2024 · 8740de5 · 8740de5
2 parents 78ee945 + 0835bc2
commit 8740de5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
@@ -79,6 +79,8 @@ UBDocumentController* UBApplication::documentController = 0;
 
 UBMainWindow* UBApplication::mainWindow = 0;
 
+bool UBApplication::isClosing = false;
+
 const QString UBApplication::mimeTypeUniboardDocument = QString("application/vnd.mnemis-uniboard-document");
 const QString UBApplication::mimeTypeUniboardPage = QString("application/vnd.mnemis-uniboard-page");
 const QString UBApplication::mimeTypeUniboardPageItem =  QString("application/vnd.mnemis-uniboard-page-item");
@@ -507,6 +509,8 @@ void UBApplication::closeEvent(QCloseEvent *event)
 
 void UBApplication::closing()
 {
+    isClosing = true;
+
     if (UBSettings::settings()->emptyTrashForOlderDocuments->get().toBool())
     {
         UBDocumentTreeModel *docModel = UBPersistenceManager::persistenceManager()->mDocumentTreeStructureModel;

diff --git a/src/core/UBApplication.h b/src/core/UBApplication.h
@@ -78,6 +78,8 @@ class UBApplication : public SingleApplication
 
         static UBMainWindow* mainWindow;
 
+        static bool isClosing;
+
         static UBApplication* app()
         {
             return dynamic_cast<UBApplication*>qApp;

diff --git a/src/core/UBSceneCache.cpp b/src/core/UBSceneCache.cpp
@@ -322,6 +322,13 @@ void UBSceneCache::SceneCacheEntry::startLoading()
 {
     mTimer = new QTimer;
     QObject::connect(mTimer, &QTimer::timeout, mTimer, [this](){
+        if (UBApplication::isClosing)
+        {
+            mTimer->stop();
+            delete mTimer;
+            return;
+        }
+
         if (mContext)
         {
             mContext->step();