summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Joannon <hello@pauljoannon.com>2018-02-24 16:59:18 +0100
committerPaul Joannon <hello@pauljoannon.com>2018-02-24 21:18:57 +0100
commit3ee4ce51a9d564584b7878c125085e57faa32f98 (patch)
treeacadd28de974706cdba6c157fd4204bc3bd205d6
parent89af6c2cd7b6f8ebbed12085384441a3480b2846 (diff)
only show information we have in stacktrace
do not show line number and/or file if not defined
-rw-r--r--editor/script_editor_debugger.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp
index da3a4ee919..7fa3ed34f0 100644
--- a/editor/script_editor_debugger.cpp
+++ b/editor/script_editor_debugger.cpp
@@ -1646,12 +1646,20 @@ void ScriptEditorDebugger::_error_selected(int p_idx) {
md.push_back(st[i + 1]);
md.push_back(st[i + 2]);
- String str = func + " in " + script.get_file() + ":line " + itos(line);
+ String str = func;
+ String tooltip_str = TTR("Function:") + " " + func;
+ if (script.length() > 0) {
+ str += " in " + script.get_file();
+ tooltip_str = TTR("File:") + " " + script + "\n" + tooltip_str;
+ if (line > 0) {
+ str += ":line " + itos(line);
+ tooltip_str += "\n" + TTR("Line:") + " " + itos(line);
+ }
+ }
error_stack->add_item(str);
error_stack->set_item_metadata(error_stack->get_item_count() - 1, md);
- error_stack->set_item_tooltip(error_stack->get_item_count() - 1,
- TTR("File:") + " " + script + "\n" + TTR("Function:") + " " + func + "\n" + TTR("Line:") + " " + itos(line));
+ error_stack->set_item_tooltip(error_stack->get_item_count() - 1, tooltip_str);
}
}