summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gdscript_editor.cpp
diff options
context:
space:
mode:
authorTimo Schwarzer <me@timoschwarzer.com>2019-01-03 15:51:34 +0100
committerTimo Schwarzer <me@timoschwarzer.com>2019-01-03 15:51:34 +0100
commitd77643562bd484a63492d939354c26360b88b9b1 (patch)
tree21637b3aa5206950221042a11e5eb27568dc12bd /modules/gdscript/gdscript_editor.cpp
parent200be0795d1fc10c2628c00eafc0d276b669301e (diff)
downloadredot-engine-d77643562bd484a63492d939354c26360b88b9b1.tar.gz
Fix segfault when trying to autocomplete in inner classes
Fixes #24697
Diffstat (limited to 'modules/gdscript/gdscript_editor.cpp')
-rw-r--r--modules/gdscript/gdscript_editor.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index 6f06d518e5..56540b1269 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -2442,9 +2442,13 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base
context._class = parser.get_completion_class();
context.block = parser.get_completion_block();
context.function = parser.get_completion_function();
- context.base = p_owner;
- context.base_path = p_base_path;
context.line = parser.get_completion_line();
+
+ if (!context._class) {
+ context.base = p_owner;
+ context.base_path = p_base_path;
+ }
+
bool is_function = false;
switch (parser.get_completion_type()) {