Refs #4333. Fix a possible crash in DataItem upcasting.

mantidproject · Dec 19, 2011 · a3cb44a · a3cb44a
1 parent dc4ac84
commit a3cb44a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/PropertyMarshal.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/PropertyMarshal.cpp
@@ -79,12 +79,13 @@ namespace Mantid
         {
           if( PyObject_IsSubclass((PyObject*)it->first, valueType) )
           {
-            if( !result && it->second->isInstance(value) ) // First one
+            if( !result && it->second->isInstance(value) )
             {
               result = it->first;
             }
             // Check if this match is further up the chain than the last
-            else if(PyObject_IsSubclass((PyObject*)it->first, (PyObject*)result) && it->second->isInstance(value) )
+            if( result && PyObject_IsSubclass((PyObject*)it->first, (PyObject*)result)
+                && it->second->isInstance(value) )
             {
               result = it->first;
             }