Fixed crash when changing layer without a current object

It would crash when deleting a layer, for example.
willt · Mar 6, 2017 · 11f1ef9 · 11f1ef9
1 parent cd87cbc
commit 11f1ef9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/tiled/mapdocument.cpp b/src/tiled/mapdocument.cpp
@@ -236,8 +236,9 @@ void MapDocument::setCurrentLayer(Layer *layer)
     mCurrentLayer = layer;
     emit currentLayerChanged(mCurrentLayer);
 
-    if (mCurrentLayer && currentObject()->typeId() == Object::LayerType)
-        setCurrentObject(mCurrentLayer);
+    if (mCurrentLayer && mCurrentObject)
+        if (mCurrentObject->typeId() == Object::LayerType)
+            setCurrentObject(mCurrentLayer);
 }
 
 /**