Переглянути джерело

Merge pull request #10701 from hpvb/fix-callback-crash

Fix a crash in gdscript callbacks
Rémi Verschelde 8 роки тому
батько
коміт
909c9e0ba0
1 змінених файлів з 2 додано та 2 видалено
  1. 2 2
      modules/gdscript/gd_function.cpp

+ 2 - 2
modules/gdscript/gd_function.cpp

@@ -1418,7 +1418,7 @@ Variant GDFunctionState::_signal_callback(const Variant **p_args, int p_argcount
 	// If the return value is a GDFunctionState reference,
 	// then the function did yield again after resuming.
 	if (ret.is_ref()) {
-		GDFunctionState *gdfs = Object::cast_to<GDFunctionState>((Object *)&ret);
+		GDFunctionState *gdfs = Object::cast_to<GDFunctionState>(ret);
 		if (gdfs && gdfs->function == function)
 			completed = false;
 	}
@@ -1474,7 +1474,7 @@ Variant GDFunctionState::resume(const Variant &p_arg) {
 	// If the return value is a GDFunctionState reference,
 	// then the function did yield again after resuming.
 	if (ret.is_ref()) {
-		GDFunctionState *gdfs = Object::cast_to<GDFunctionState>((Object *)&ret);
+		GDFunctionState *gdfs = Object::cast_to<GDFunctionState>(ret);
 		if (gdfs && gdfs->function == function)
 			completed = false;
 	}