fix crash

jef · jef · commit 721cc0f23e01 · 2011-02-12T16:28:08.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15160 c8812cc2-4d05-0410-92ff-de0c093fc19c
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()
 
 

Original file line number	Diff line number	Diff line change
`@@ -281,18 +281,15 @@ QgsPropertyKey::~QgsPropertyKey()`
`281`	`281`
`282`	`282`	`QVariant QgsPropertyKey::value() const`
`283`	`283`	`{`
`284`		`- QgsProperty * foundQgsProperty;`
	`284`	`+ QgsProperty *foundQgsProperty = mProperties.value( name() );`
`285`	`285`
`286`		`- if ( 0 == ( foundQgsProperty = mProperties.value( name() ) ) )`
`287`		`- { // recurse down to next key`
`288`		`- return foundQgsProperty->value();`
`289`		`- }`
`290`		`- else`
	`286`	`+ if ( !foundQgsProperty )`
`291`	`287`	`{`
`292`	`288`	`QgsDebugMsg( "key has null child" );`
`293`		`-`
`294`	`289`	`return QVariant(); // just return an QVariant::Invalid`
`295`	`290`	`}`
	`291`	`+`
	`292`	`+ return foundQgsProperty->value();`
`296`	`293`	`} // QVariant QgsPropertyKey::value()`
`297`	`294`
`298`	`295`