Fix bug in TilesetPalette

ExplosBlue · May 31, 2024 · f2ab08d · f2ab08d
1 parent a44be1e
commit f2ab08d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml
@@ -117,7 +117,6 @@ jobs:
             dir:          ${{ runner.temp }}
             cache:        'true'
             cache-key-prefix: 'install-qt-action-macos'
-            setup-python: false
 
         - name: Setup xcode
           uses: maxim-lobanov/setup-xcode@v1

diff --git a/leveleditor/tilesetpalette.cpp b/leveleditor/tilesetpalette.cpp
@@ -153,20 +153,27 @@ void TilesetPalette::reloadTilesets()
 
 void TilesetPalette::loadTileset(int tilesetNbr)
 {
-    if (objectsModel == nullptr)
-    {
-        objectsModel = new QStandardItemModel(this);
-    }
-
     if (!level->tilesets[tilesetNbr])
     {
         objectLists[tilesetNbr]->setEnabled(false);
+
+        QStandardItemModel* objectsModel = dynamic_cast<QStandardItemModel*>(objectLists[tilesetNbr]->model());
+        if (objectsModel == nullptr)
+        {
+           objectsModel = new QStandardItemModel(this);
+        }
         objectsModel->clear();
         objectLists[tilesetNbr]->setModel(objectsModel);
         return;
     }
 
     objectLists[tilesetNbr]->setEnabled(true);
+
+    QStandardItemModel* objectsModel = dynamic_cast<QStandardItemModel*>(objectLists[tilesetNbr]->model());
+    if (objectsModel == nullptr)
+    {
+        objectsModel = new QStandardItemModel(this);
+    }
     objectsModel->clear();
 
     for (int i = 0; i < level->tilesets[tilesetNbr]->getNumObjects(); i++)

diff --git a/leveleditor/tilesetpalette.h b/leveleditor/tilesetpalette.h
@@ -29,7 +29,6 @@ private slots:
     EditManager *editManager;
     Game *game;
     QUndoStack *undoStack;
-    QStandardItemModel* objectsModel = nullptr;
 
     QTabWidget *tabWidget;
     QList<QComboBox*> tilesetPickers;