Fix bug 655 - "bad re-implementations of QApplication.notify result in a SystemError"

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 220975e18..d5697ab72 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -615,6 +615,13 @@ void CppGenerator::writeVirtualMethodNative(QTextStream &s, const AbstractMetaFu
 
     s << INDENT << "Shiboken::GilState gil;" << endl;
 
+    // Get out of virtual method call if someone already threw an error.
+    s << INDENT << "if (PyErr_Occurred())" << endl;
+    {
+        Indentation indentation(INDENT);
+        s << INDENT << "return " << defaultReturnExpr << ';' << endl;
+    }
+
     s << INDENT << "Shiboken::AutoDecRef py_override(Shiboken::BindingManager::instance().getOverride(this, \"";
     s << funcName << "\"));" << endl;
 
@@ -1855,7 +1862,7 @@ void CppGenerator::writeNamedArgumentResolution(QTextStream& s, const AbstractMe
                         Indentation indent(INDENT);
                         s << INDENT << pyArgName << " = value;" << endl;
                     }
-                    s << "else" << endl;
+                    s << INDENT << "else" << endl;
                     {
                         Indentation indent(INDENT);
                         s << INDENT << "goto " << cpythonFunctionName(func) << "_TypeError;" << endl;