From: daid303 <daid303@gmail.com>
Date: Fri, 12 Apr 2013 16:56:31 +0000 (+0200)
Subject: Do not show the merge menu when no object is selected.
X-Git-Tag: 13.05~106
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=164093f8c45be59784e5f95b0381b28ed916d878;p=cura.git

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

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index e17491f6..ef31eb11 100644
--- 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)