godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-31 18:41:20 +00:00
Code Releases Wiki Activity

Merge pull request #113619 from HolonProduction/once-upon-a-time-there-was-a-file-which-one-i-dont-know-the-history-was-locked

Browse Source 
Ensure correct unlocking of script editor history
This commit is contained in:
Thaddeus Crews
2025-12-11 12:12:42 -06:00
parent 3008b5c59f 31307ce856
commit bb4b4e3890
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/script/script_editor_plugin.cpp
View File

@@ -676,7 +676,6 @@ void ScriptEditor::_save_history() {
void ScriptEditor::_save_previous_state(Dictionary p_state) {
if (lock_history) {
// Done as a result of a deferred call triggered by set_edit_state().
lock_history = false;
return;
}
@@ -3854,6 +3853,10 @@ void ScriptEditor::_update_selected_editor_menu() {
}
}
void ScriptEditor::_unlock_history() {
lock_history = false;
}
void ScriptEditor::_update_history_pos(int p_new_pos) {
Node *n = tab_container->get_current_tab_control();
@@ -3873,6 +3876,10 @@ void ScriptEditor::_update_history_pos(int p_new_pos) {
if (seb) {
lock_history = true;
seb->set_edit_state(history[history_pos].state);
// `set_edit_state()` can modify the caret position which might trigger a
// request to save the history. Since `TextEdit::caret_changed` is emitted
// deferred, we need to defer unlocking of the history as well.
callable_mp(this, &ScriptEditor::_unlock_history).call_deferred();
seb->ensure_focus();
Ref<Script> scr = seb->get_edited_resource();