[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames/libkdegames
From:       Mathias Kraus <k.hias () gmx ! de>
Date:       2012-05-23 20:17:04
Message-ID: 20120523201704.1A8C6AC76D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1296328 by mkraus:

REVIEW: 6957
fix KgThemeProvider crash in redicoverThemes()

 M  +13 -0     kgthemeprovider.cpp  


--- trunk/KDE/kdegames/libkdegames/kgthemeprovider.cpp #1296327:1296328
@@ -162,6 +162,9 @@
 	{
 		return; //discoverThemes() was never called
 	}
+	
+	KgTheme* defaultTheme = NULL;
+	
 	d->m_inRediscover = true;
 	const QString defaultFileName = d->m_dtDefaultThemeName + QLatin1String(".desktop");
 	const QStringList themePaths = KGlobal::dirs()->findAllResources(
@@ -210,6 +213,7 @@
 		if (fi.fileName() == defaultFileName)
 		{
 			themes.prepend(theme);
+			defaultTheme = theme;
 		}
 		else
 		{
@@ -221,7 +225,16 @@
 	{
 		addTheme(theme);
 	}
+	
+	if(defaultTheme != NULL)
+	{
+		setDefaultTheme(defaultTheme);
+	}
+	else if(d->m_defaultTheme == NULL && themes.count() != 0)
+	{
 	setDefaultTheme(themes.value(0));
+	}
+	
 	d->m_inRediscover = false;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]