From 5c5c62dc55b84af43bbe72359fdd07f0e4841569 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 13 Jun 2020 03:37:38 -0500
Subject: [PATCH] [nostalgia/core/studio] Fix TileSheetEditor not to display
 context menu when right click is not on tile

---
 src/nostalgia/core/studio/TileSheetEditor.qml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/nostalgia/core/studio/TileSheetEditor.qml b/src/nostalgia/core/studio/TileSheetEditor.qml
index c4f4632c4..49b670564 100644
--- a/src/nostalgia/core/studio/TileSheetEditor.qml
+++ b/src/nostalgia/core/studio/TileSheetEditor.qml
@@ -23,7 +23,10 @@ Rectangle {
 
 		onClicked: {
 			if (mouse.button === Qt.RightButton) {
-				contextMenu.popup();
+				var tile = mouseArea.tileAt(mouseX, mouseY);
+				if (tile) {
+					contextMenu.popup();
+				}
 			} else {
 				contextMenu.dismiss();
 			}
@@ -92,7 +95,9 @@ Rectangle {
 				text: "Insert Tile"
 				onTriggered: {
 					var tile = mouseArea.tileAt(contextMenu.x, contextMenu.y);
-					sheetData.insertTileCmd(tile.tileNumber);
+					if (tile) {
+						sheetData.insertTileCmd(tile.tileNumber);
+					}
 				}
 			}