From 6c47624e9276061a3b003adea844b5ce12d85486 Mon Sep 17 00:00:00 2001
From: Lauro Neto <lauro.neto@openbossa.org>
Date: Tue, 18 Oct 2011 15:07:54 -0300
Subject: Fix getTypeName check order.

Was segfaulting for signals with None as an explicit
argument (returning NULL to a strdup).

Reviewer: Hugo Lima <hugo.lima@openbossa.org>
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
---
 libpyside/pysidesignal.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp
index e3a210381..53c581463 100644
--- a/libpyside/pysidesignal.cpp
+++ b/libpyside/pysidesignal.cpp
@@ -585,10 +585,10 @@ char* getTypeName(PyObject* type)
                 typeName = strdup("PyObject");
         }
         return typeName;
+    } else if (type == Py_None) { // Must be checked before as Shiboken::String::check accepts Py_None
+        return strdup("void");
     } else if (Shiboken::String::check(type)) {
         return strdup(Shiboken::String::toCString(type));
-    } else if (type == Py_None) {
-        return strdup("void");
     }
     return 0;
 }
-- 
cgit v1.2.3