Fixed saving of geometry of tile animation and collision editors

mapeditor · Oct 14, 2016 · d0d0d7c · d0d0d7c
1 parent bd3dc1a
commit d0d0d7c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 22 deletions.
diff --git a/src/tiled/mainwindow.cpp b/src/tiled/mainwindow.cpp
@@ -461,14 +461,9 @@ MainWindow::~MainWindow()
 {
     mDocumentManager->closeAllDocuments();
 
-    // This needs to happen before deleting the TilesetManager otherwise it may
-    // hold references to tilesets.
-    // todo: Delete the MapEditor first?
-//    mTileAnimationEditor->setTile(nullptr);
-//    mTileAnimationEditor->writeSettings();
-//    mTileCollisionEditor->setTile(nullptr);
-//    mTileCollisionEditor->writeSettings();
-
+    // This needs to happen before deleting the TilesetManager, otherwise
+    // tileset references may remain. It also needs to be done before deleting
+    // the Preferences.
     mDocumentManager->deleteEditor(Document::MapDocumentType);
     mDocumentManager->deleteEditor(Document::TilesetDocumentType);
 

diff --git a/src/tiled/tileanimationeditor.cpp b/src/tiled/tileanimationeditor.cpp
@@ -308,6 +308,7 @@ TileAnimationEditor::TileAnimationEditor(QWidget *parent)
 
 TileAnimationEditor::~TileAnimationEditor()
 {
+    Utils::saveGeometry(this);
     delete mUi;
 }
 
@@ -348,11 +349,6 @@ void TileAnimationEditor::setTile(Tile *tile)
     resetPreview();
 }
 
-void TileAnimationEditor::writeSettings()
-{
-    Utils::saveGeometry(this);
-}
-
 void TileAnimationEditor::closeEvent(QCloseEvent *event)
 {
     QWidget::closeEvent(event);

diff --git a/src/tiled/tileanimationeditor.h b/src/tiled/tileanimationeditor.h
@@ -50,8 +50,6 @@ class TileAnimationEditor : public QDialog
 
     void setTilesetDocument(TilesetDocument *tilesetDocument);
 
-    void writeSettings();
-
 signals:
     void closed();
 

diff --git a/src/tiled/tilecollisioneditor.cpp b/src/tiled/tilecollisioneditor.cpp
@@ -147,6 +147,7 @@ TileCollisionEditor::TileCollisionEditor(QWidget *parent)
 
 TileCollisionEditor::~TileCollisionEditor()
 {
+    Utils::saveGeometry(this);
     setTile(nullptr);
 }
 
@@ -166,11 +167,6 @@ void TileCollisionEditor::setTilesetDocument(TilesetDocument *tilesetDocument)
     }
 }
 
-void TileCollisionEditor::writeSettings()
-{
-    Utils::saveGeometry(this);
-}
-
 void TileCollisionEditor::setTile(Tile *tile)
 {
     if (mTile == tile)

diff --git a/src/tiled/tilecollisioneditor.h b/src/tiled/tilecollisioneditor.h
@@ -55,8 +55,6 @@ class TileCollisionEditor : public QMainWindow
 
     void setTilesetDocument(TilesetDocument *tilesetDocument);
 
-    void writeSettings();
-
 signals:
     void closed();