diff options
| -rw-r--r-- | libshiboken/conversions.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h index b1d57eb61..91243a07c 100644 --- a/libshiboken/conversions.h +++ b/libshiboken/conversions.h @@ -150,12 +150,13 @@ struct Converter<T*> static T* toCpp(PyObject* pyobj) { - if (pyobj == Py_None) - return 0; - else if (Shiboken_TypeCheck(pyobj, T)) + if (Shiboken_TypeCheck(pyobj, T)) return (T*) getCppPointer(pyobj, SbkType<T>()); else if (Converter<T>::isConvertible(pyobj)) return CppObjectCopier<T>::copy(Converter<T>::toCpp(pyobj)); + else if (pyobj == Py_None) + return 0; + assert(false); return 0; } }; |