summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBil Bas (Spooner) <bil.bagpuss@gmail.com>2015-02-19 15:45:49 +0000
committerBil Bas (Spooner) <bil.bagpuss@gmail.com>2015-02-19 15:45:49 +0000
commitdb2381de7afffc932d051ec9fc853bfe06645060 (patch)
treee14003d1d8d327c1511f051f1970ac2ce498d6a6 /modules
parente3bf8ab02da6a5d4f4d52aa3b1ac73df59f76282 (diff)
Correctly halt on error in sprintf parsing (fixes #1393)
Diffstat (limited to 'modules')
-rw-r--r--modules/gdscript/gd_script.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index 0aa115ffbc..2a1e7a18df 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -337,7 +337,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
Variant::evaluate(op,*a,*b,*dst,valid);
if (!valid) {
- if (false && dst->get_type()==Variant::STRING) {
+ if (dst->get_type()==Variant::STRING) {
//return a string when invalid with the error
err_text=*dst;
} else {