Fix memory leak in TilesetPalette

ExplosBlue · May 31, 2024 · c69cb64 · c69cb64
1 parent b4c570a
commit c69cb64
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/leveleditor/tilesetpalette.cpp b/leveleditor/tilesetpalette.cpp
@@ -153,15 +153,21 @@ void TilesetPalette::reloadTilesets()
 
 void TilesetPalette::loadTileset(int tilesetNbr)
 {
+    if (objectsModel == nullptr)
+    {
+        objectsModel = new QStandardItemModel(this);
+    }
+
     if (!level->tilesets[tilesetNbr])
     {
         objectLists[tilesetNbr]->setEnabled(false);
-        objectLists[tilesetNbr]->setModel(new QStandardItemModel(this));
+        objectsModel->clear();
+        objectLists[tilesetNbr]->setModel(objectsModel);
         return;
     }
-    objectLists[tilesetNbr]->setEnabled(true);
 
-    QStandardItemModel* objectsModel = new QStandardItemModel(this);
+    objectLists[tilesetNbr]->setEnabled(true);
+    objectsModel->clear();
 
     for (int i = 0; i < level->tilesets[tilesetNbr]->getNumObjects(); i++)
     {

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