# HG changeset patch # User Torsten Lilge # Date 1622378556 -7200 # Node ID 82e45c11da7d0f525e530db2dc85b0e37a277d5d # Parent 6375e8ed2838ba17d8ebbf065d3cd4afdf43d351 fix auto completion in default empty script of GUI editor (bug #60689) * file-editor.cc (file_editor): initialize new data member m_editor_ready storing whether the editor is ready after startup; (empty_script): set ready flag at startup, return on non-startup calls if editor still not ready; (handle_visibility): just return if editor is not yet ready; * file-editor.h new data member m_editor_ready diff -r 6375e8ed2838 -r 82e45c11da7d libgui/src/m-editor/file-editor.cc --- a/libgui/src/m-editor/file-editor.cc Sun May 30 13:57:11 2021 +0200 +++ b/libgui/src/m-editor/file-editor.cc Sun May 30 14:42:36 2021 +0200 @@ -117,6 +117,7 @@ m_closed = false; m_no_focus = false; + m_editor_ready = false; m_copy_action_enabled = false; m_undo_action_enabled = false; @@ -255,6 +256,15 @@ // 2. When the editor becomes visible when octave is running void file_editor::empty_script (bool startup, bool visible) { + + if (startup) + m_editor_ready = true; + else + { + if (! m_editor_ready) + return; // not yet ready but got visibility changed signals + } + resource_manager& rmgr = m_octave_qobj.get_resource_manager (); gui_settings *settings = rmgr.get_settings (); if (settings->value (global_use_custom_editor.key, @@ -1461,6 +1471,9 @@ { octave_dock_widget::handle_visibility (visible); + if (! m_editor_ready) + return; + if (m_closed && visible) { m_closed = false; diff -r 6375e8ed2838 -r 82e45c11da7d libgui/src/m-editor/file-editor.h --- a/libgui/src/m-editor/file-editor.h Sun May 30 13:57:11 2021 +0200 +++ b/libgui/src/m-editor/file-editor.h Sun May 30 14:42:36 2021 +0200 @@ -476,6 +476,7 @@ bool m_closing_canceled; bool m_closed; bool m_no_focus; + bool m_editor_ready; enum { MaxMRUFiles = 10 }; QMenu *m_mru_file_menu;