Fix bug#402 - "Exceptions raised in event methods aren't printed to console until termination"

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Renato Araújo <renato.filho@openbossa.org>

1 files changed, 13 insertions, 11 deletions

diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 3e4f85658..dd64dc0a6 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -618,21 +618,23 @@ void CppGenerator::writeVirtualMethodNative(QTextStream &s, const AbstractMetaFu
     if (!injectedCodeCallsPythonOverride(func)) {
         s << INDENT;
         s << "Shiboken::AutoDecRef " PYTHON_RETURN_VAR "(PyObject_Call(py_override, pyargs, NULL));" << endl;
+
+        s << INDENT << "// An error happened in python code!" << endl;
+        s << INDENT << "if (" PYTHON_RETURN_VAR ".isNull()) {" << endl;
+        {
+            Indentation indent(INDENT);
+            s << INDENT << "PyErr_Print();" << endl;
+            s << INDENT << "return ";
+            if (type)
+                writeMinimalConstructorCallArguments(s, func->type());
+            s << ';' << endl;
+        }
+        s << INDENT << '}' << endl;
+
         if (type) {
             if (invalidateReturn)
                 s << INDENT << "bool invalidadeArg0 = " PYTHON_RETURN_VAR "->ob_refcnt == 1;" << endl;
 
-            s << INDENT << "// An error happened in python code!" << endl;
-            s << INDENT << "if (" PYTHON_RETURN_VAR ".isNull()) {" << endl;
-            {
-                Indentation indent(INDENT);
-                s << INDENT << "PyErr_Print();" << endl;
-                s << INDENT << "return ";
-                writeMinimalConstructorCallArguments(s, func->type());
-                s << ';' << endl;
-            }
-            s << INDENT << '}' << endl;
-
             if (func->type()) {
                 s << INDENT << "// Check return type" << endl;
                 s << INDENT << "bool typeIsValid = ";