Browse Source

VCS: Fix empty metadata items being moved across stages

Twarit Waikar 3 years ago
parent
commit
c698e4f5f9
1 changed files with 7 additions and 2 deletions
  1. 7 2
      editor/plugins/version_control_editor_plugin.cpp

+ 7 - 2
editor/plugins/version_control_editor_plugin.cpp

@@ -553,10 +553,15 @@ void VersionControlEditorPlugin::_item_activated(Object *p_tree) {
 void VersionControlEditorPlugin::_move_item(Tree *p_tree, TreeItem *p_item) {
 	CHECK_PLUGIN_INITIALIZED();
 
+	if (!p_item->has_meta(SNAME("file_path"))) {
+		// We only move items that are coming from files
+		return;
+	}
+
 	if (p_tree == staged_files) {
-		EditorVCSInterface::get_singleton()->unstage_file(p_item->get_meta("file_path"));
+		EditorVCSInterface::get_singleton()->unstage_file(p_item->get_meta(SNAME("file_path")));
 	} else {
-		EditorVCSInterface::get_singleton()->stage_file(p_item->get_meta("file_path"));
+		EditorVCSInterface::get_singleton()->stage_file(p_item->get_meta(SNAME("file_path")));
 	}
 }