Fix transfer ownership on return values.

Reviewed by Marcelo Lira <marcelo.lira@openbossa.org>

1 files changed, 12 insertions, 7 deletions

diff --git a/cppgenerator.cpp b/cppgenerator.cpp
index 136026bee..3f83f137e 100644
--- a/cppgenerator.cpp
+++ b/cppgenerator.cpp
@@ -1276,13 +1276,18 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f
             }
 
             s << INDENT;
-            if (arg_mod.ownerships[TypeSystem::TargetLangCode] == TypeSystem::TargetLangOwnership)
-                s << "SbkBaseWrapper_setOwnership(" << pyArgName << ", true";
-            else if (wrappedClass->hasVirtualDestructor())
-                s << "BindingManager::instance().transferOwnershipToCpp(" << pyArgName;
-            else
-                s << "BindingManager::instance().invalidateWrapper(" << pyArgName;
-            s << ");" << endl;
+            if (arg_mod.ownerships[TypeSystem::TargetLangCode] == TypeSystem::TargetLangOwnership) {
+                s << "SbkBaseWrapper_setOwnership(" << pyArgName << ", true);";
+            } else if (wrappedClass->hasVirtualDestructor()) {
+                if (arg_mod.index == 0) {
+                    s << "SbkBaseWrapper_setOwnership(py_result, 0);";
+                } else {
+                    s << "BindingManager::instance().transferOwnershipToCpp(" << pyArgName << ");";
+                }
+            } else {
+                s << "BindingManager::instance().invalidateWrapper(" << pyArgName << ");";
+            }
+            s << endl;
         }
     }
 }