fix crash

git-svn-id: http://svn.osgeo.org/qgis/trunk@15160 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 12, 2011 · 721cc0f23e01c3ade4f3f24a0c059e829e488fd8 · 721cc0f
1 parent dd23dde
commit 721cc0f23e01c3ade4f3f24a0c059e829e488fd8
Unified Split

Showing with 4 additions and 7 deletions.

+4 −7 src/core/qgsprojectproperty.cpp
diff --git a/src/core/qgsprojectproperty.cpp b/src/core/qgsprojectproperty.cpp
@@ -281,18 +281,15 @@ QgsPropertyKey::~QgsPropertyKey()
 
 QVariant QgsPropertyKey::value() const
 {
-  QgsProperty * foundQgsProperty;
+  QgsProperty *foundQgsProperty = mProperties.value( name() );
 
-  if ( 0 == ( foundQgsProperty = mProperties.value( name() ) ) )
-  {                        // recurse down to next key
-    return foundQgsProperty->value();
-  }
-  else
+  if ( !foundQgsProperty )
   {
     QgsDebugMsg( "key has null child" );
-
     return QVariant();     // just return an QVariant::Invalid
   }
+
+  return foundQgsProperty->value();
 } // QVariant QgsPropertyKey::value()