Do not show the merge menu when no object is selected.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index e17491f6985ee5c7b0803e422bf4466c8c66b6b0..ef31eb116345eff4909356815c31b7220411dd27 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -362,7 +362,7 @@ class SceneView(openglGui.glGuiPanel):
                                        self.Bind(wx.EVT_MENU, self.OnDuplicateObject, menu.Append(-1, 'Duplicate'))
                                        self.PopupMenu(menu)
                                        menu.Destroy()
-                               if self._selectedObj != self._focusObj and self._focusObj is not None:
+                               if self._selectedObj != self._focusObj and self._selectedObj is not None and self._focusObj is not None:
                                        menu = wx.Menu()
                                        self.Bind(wx.EVT_MENU, self.OnMergeObjects, menu.Append(-1, 'Merge'))
                                        self.PopupMenu(menu)