From 7ec8a6e75610558530817f4813ca2f11fcc4094d Mon Sep 17 00:00:00 2001
From: Hein-Pieter van Braam <hp@tmm.cx>
Date: Sat, 28 Apr 2018 16:40:31 +0200
Subject: [PATCH] Fix converting a tilset if the existing file is not a tileset

See ed3b080ca6ebc4361306a786dcc2d45481ee8ed9
---
 editor/editor_node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 497de36bc79..a4ee0d8d131 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -1198,7 +1198,7 @@ void EditorNode::_dialog_action(String p_file) {
 		case FILE_EXPORT_TILESET: {
 
 			Ref<TileSet> ml;
-			if (FileAccess::exists(p_file)) {
+			if (FileAccess::exists(p_file) && file_export_lib_merge->is_pressed()) {
 				ml = ResourceLoader::load(p_file, "TileSet");
 
 				if (ml.is_null()) {