Browse Source

Merge pull request #3282 from TheHX/pr-script-debugger

Fix debugger close button and script editor "Show Debugger"
Rémi Verschelde 9 years ago
parent
commit
515567d491

+ 1 - 1
tools/editor/plugins/script_editor_plugin.cpp

@@ -2413,7 +2413,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	debug_menu->get_popup()->add_item("Continue",DEBUG_CONTINUE);
 	debug_menu->get_popup()->add_separator();
 	debug_menu->get_popup()->add_check_item("Show Debugger",DEBUG_SHOW);
-	debug_menu->get_popup()->add_check_item("Keep Debuger Open",DEBUG_SHOW_KEEP_OPEN);
+	debug_menu->get_popup()->add_check_item("Keep Debugger Open",DEBUG_SHOW_KEEP_OPEN);
 	debug_menu->get_popup()->connect("item_pressed", this,"_menu_option");
 
 	debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_NEXT), true);

+ 2 - 1
tools/editor/script_editor_debugger.cpp

@@ -569,8 +569,8 @@ void ScriptEditorDebugger::_notification(int p_what) {
 
 					ppeer->set_stream_peer(connection);
 
-
 					show();
+					emit_signal("show_debugger",true);
 
 					dobreak->set_disabled(false);
 					tabs->set_current_tab(0);
@@ -770,6 +770,7 @@ void ScriptEditorDebugger::_stack_dump_frame_selected() {
 
 void ScriptEditorDebugger::_hide_request() {
 
+	hide();
 	emit_signal("show_debugger",false);
 }