summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-09-27 09:53:44 +0200
committerRémi Verschelde <rverschelde@gmail.com>2022-09-27 09:53:44 +0200
commit43eac58e314badb012162f7ad535603f463c89e5 (patch)
treeeaaf759e878c19df409e72b5385030d10b2443db
parent84f2c68c84bde10026454292578e5fdcc9ab69a3 (diff)
parenta98e2eb36f9e46b2ea5b5a199ff23d8365936fe3 (diff)
Merge pull request #66441 from Calinou/editor-fix-play-buttons-disappearing
Fix project run/stop buttons disappearing in the editor
-rw-r--r--editor/editor_node.cpp2
-rw-r--r--editor/editor_run.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 28768b7f34..284c3612ce 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -6957,6 +6957,8 @@ EditorNode::EditorNode() {
play_custom_scene_button->connect("pressed", callable_mp(this, &EditorNode::_menu_option).bind(RUN_PLAY_CUSTOM_SCENE));
play_custom_scene_button->set_tooltip_text(TTR("Run a specific scene."));
+ _reset_play_buttons();
+
ED_SHORTCUT_AND_COMMAND("editor/run_specific_scene", TTR("Run Specific Scene"), KeyModifierMask::META | KeyModifierMask::SHIFT | Key::F5);
ED_SHORTCUT_OVERRIDE("editor/run_specific_scene", "macos", KeyModifierMask::META | KeyModifierMask::SHIFT | Key::R);
play_custom_scene_button->set_shortcut(ED_GET_SHORTCUT("editor/run_specific_scene"));
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp
index b909129b18..26dac8a675 100644
--- a/editor/editor_run.cpp
+++ b/editor/editor_run.cpp
@@ -260,7 +260,7 @@ Error EditorRun::run(const String &p_scene, const String &p_write_movie) {
// Pass the debugger stop shortcut to the running instance(s).
String shortcut;
- VariantWriter::write_to_string(ED_GET_SHORTCUT("editor/stop"), shortcut);
+ VariantWriter::write_to_string(ED_GET_SHORTCUT("editor/stop_running_project"), shortcut);
OS::get_singleton()->set_environment("__GODOT_EDITOR_STOP_SHORTCUT__", shortcut);
printf("Running: %s", exec.utf8().get_data());