Merge pull request #53979 from KoBeWi/bug_from_the_past

1 files changed, 9 insertions, 1 deletions

diff --git a/editor/editor_command_palette.cpp b/editor/editor_command_palette.cpp
index e69ced8522..71e9fac219 100644
--- a/editor/editor_command_palette.cpp
+++ b/editor/editor_command_palette.cpp
@@ -212,6 +212,12 @@ void EditorCommandPalette::_add_command(String p_command_name, String p_key_name
 	command.callable = p_binded_action;
 	command.shortcut = p_shortcut_text;
 
+	// Commands added from plugins don't exist yet when the history is loaded, so we assign the last use time here if it was recorded.
+	Dictionary command_history = EditorSettings::get_singleton()->get_project_metadata("command_palette", "command_history", Dictionary());
+	if (command_history.has(p_key_name)) {
+		command.last_used = command_history[p_key_name];
+	}
+
 	commands[p_key_name] = command;
 }
 
@@ -242,7 +248,9 @@ void EditorCommandPalette::register_shortcuts_as_command() {
 	Array history_entries = command_history.keys();
 	for (int i = 0; i < history_entries.size(); i++) {
 		const String &history_key = history_entries[i];
-		commands[history_key].last_used = command_history[history_key];
+		if (commands.has(history_key)) {
+			commands[history_key].last_used = command_history[history_key];
+		}
 	}
 }