Merge branch '1.11'

Conflicts: NEWS.md docs/manual/export-yy.rst src/tiled/propertieswidget.cpp
mapeditor · Jan 28, 2025 · ce589a1 · ce589a1
2 parents d9ac146 + 5176431
commit ce589a1
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 10 deletions.
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -16,7 +16,7 @@ on:
 
 env:
   QBS_VERSION: 2.4.1
-  SENTRY_VERSION: 0.7.13
+  SENTRY_VERSION: 0.7.19
   SENTRY_ORG: mapeditor
   SENTRY_PROJECT: tiled
   TILED_RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }}

diff --git a/NEWS.md b/NEWS.md
@@ -1,9 +1,15 @@
 ### Unreleased
 
 * Added support for SVG 1.2 / CSS blending modes to layers (#3932)
+* Raised minimum supported Qt version from 5.12 to 5.15
+
+### Tiled 1.11.2 (28 Jan 2025)
+
 * YY plugin: Fixed compatibility with GameMaker 2024 (#4132)
+* Fixed crash while handling file reloads without any files opened
+* Fixed crash when closing the last file with multiple custom properties selected
 * snap: Fixed crash on startup on Wayland
-* Raised minimum supported Qt version from 5.12 to 5.15
+* AppImage: Updated to Sentry 0.7.19
 
 ### Tiled 1.11.1 (11 Jan 2025)
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -69,7 +69,7 @@
 # The short X.Y version.
 version = '1.11'
 # The full version, including alpha/beta/rc tags.
-release = '1.11.1'
+release = '1.11.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/manual/export-yy.rst b/docs/manual/export-yy.rst
@@ -26,7 +26,7 @@ as background layers.
    exporting from Tiled.
 
    In 2024, GameMaker made minor but incompatible changes to its file format.
-   Tiled 1.12 ships with an updated plugin that uses the new format.
+   Tiled 1.11.2 ships with an updated plugin that uses the new format.
 
 .. _yy-asset-references:
 

diff --git a/org.mapeditor.Tiled.appdata.xml b/org.mapeditor.Tiled.appdata.xml
@@ -19,6 +19,18 @@
  </keywords>
  <content_rating type="oars-1.0" />
  <releases>
+  <release version="1.11.2" type="stable" date="2025-01-28">
+   <url>https://www.mapeditor.org/2025/01/28/tiled-1-11-2-released.html</url>
+   <description>
+    <ul>
+      <li>YY plugin: Fixed compatibility with GameMaker 2024 (#4132)</li>
+      <li>Fixed crash while handling file reloads without any files opened</li>
+      <li>Fixed crash when closing the last file with multiple custom properties selected</li>
+      <li>snap: Fixed crash on startup on Wayland</li>
+      <li>AppImage: Updated to Sentry 0.7.19</li>
+    </ul>
+   </description>
+  </release>
   <release version="1.11.1" type="stable" date="2025-01-11">
    <url>https://www.mapeditor.org/2025/01/11/tiled-1-11-1-released.html</url>
    <description>

diff --git a/src/tiled/documentmanager.cpp b/src/tiled/documentmanager.cpp
@@ -974,8 +974,10 @@ bool DocumentManager::reloadDocument(Document *document)
         break;
     }
 
-    if (!isDocumentChangedOnDisk(currentDocument()))
-        mFileChangedWarning->setVisible(false);
+    // We may need to hide the file changed warning
+    if (auto current = currentDocument())
+        if (!isDocumentChangedOnDisk(current))
+            mFileChangedWarning->setVisible(false);
 
     emit documentReloaded(document);
 
@@ -1172,8 +1174,10 @@ void DocumentManager::fileChanged(const QString &fileName)
 
     document->setChangedOnDisk(true);
 
-    if (isDocumentChangedOnDisk(currentDocument()))
-        mFileChangedWarning->setVisible(true);
+    // We may need to show the file changed warning
+    if (auto current = currentDocument())
+        if (isDocumentChangedOnDisk(current))
+            mFileChangedWarning->setVisible(true);
 }
 
 void DocumentManager::hideChangedWarning()

diff --git a/src/tiled/propertieswidget.cpp b/src/tiled/propertieswidget.cpp
@@ -2554,7 +2554,7 @@ void PropertiesWidget::updateActions()
     const auto properties = mPropertiesView->selectedProperties();
     bool editingTileset = mDocument && mDocument->type() == Document::TilesetDocumentType;
     bool isTileset = mDocument && mDocument->currentObject() && mDocument->currentObject()->isPartOfTileset();
-    bool canModify = !properties.isEmpty() && (!isTileset || editingTileset);
+    bool canModify = mDocument && !properties.isEmpty() && (!isTileset || editingTileset);
 
     // Disable remove and rename actions when none of the selected objects
     // actually have the selected property (it may be inherited).

diff --git a/tiled.qbs b/tiled.qbs
@@ -6,7 +6,7 @@ Project {
     qbsSearchPaths: "qbs"
     minimumQbsVersion: "1.13"
 
-    property string version: Environment.getEnv("TILED_VERSION") || "1.11.1";
+    property string version: Environment.getEnv("TILED_VERSION") || "1.11.2";
     property bool snapshot: Environment.getEnv("TILED_SNAPSHOT") == "true"
     property bool release: Environment.getEnv("TILED_RELEASE") == "true"
     property string libDir: "lib"