Only cache QIcons if a QgsApplication is present

m-kuhn · m-kuhn · commit 601e4300fa3f · 2016-04-12T16:08:28.000+02:00
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -412,8 +412,8 @@ QString QgsApplication::iconPath( const QString& iconFile )
 
 QIcon QgsApplication::getThemeIcon( const QString &theName )
 {
-  QgsApplication* app = static_cast<QgsApplication*>( instance() );
-  if ( app->mIconCache.contains( theName ) )
+  QgsApplication* app = qobject_cast<QgsApplication*>( instance() );
+  if ( app && app->mIconCache.contains( theName ) )
     return app->mIconCache.value( theName );
 
   QIcon icon;
@@ -435,7 +435,8 @@ QIcon QgsApplication::getThemeIcon( const QString &theName )
     icon = QIcon();
   }
 
-  app->mIconCache.insert( theName, icon );
+  if ( app )
+    app->mIconCache.insert( theName, icon );
   return icon;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -412,8 +412,8 @@ QString QgsApplication::iconPath( const QString& iconFile )`
`412`	`412`
`413`	`413`	`QIcon QgsApplication::getThemeIcon( const QString &theName )`
`414`	`414`	`{`
`415`		`- QgsApplication* app = static_cast<QgsApplication*>( instance() );`
`416`		`- if ( app->mIconCache.contains( theName ) )`
	`415`	`+ QgsApplication* app = qobject_cast<QgsApplication*>( instance() );`
	`416`	`+ if ( app && app->mIconCache.contains( theName ) )`
`417`	`417`	`return app->mIconCache.value( theName );`
`418`	`418`
`419`	`419`	`QIcon icon;`
`@@ -435,7 +435,8 @@ QIcon QgsApplication::getThemeIcon( const QString &theName )`
`435`	`435`	`icon = QIcon();`
`436`	`436`	`}`
`437`	`437`
`438`		`- app->mIconCache.insert( theName, icon );`
	`438`	`+ if ( app )`
	`439`	`+ app->mIconCache.insert( theName, icon );`
`439`	`440`	`return icon;`
`440`	`441`	`}`
`441`	`442`