Fix display configuration module crash

This pertains to Bug 1334 (cherry picked from commit 1d811a999d)
12 years ago · 7894190957
parent 205b339771
commit 7894190957
1 changed files with 8 additions and 4 deletions
--- a/krandr/libkrandr.cc
+++ b/krandr/libkrandr.cc
@ -75,8 +75,8 @@ TQString capitalizeString(TQString in) {
 }

 TQString KRandrSimpleAPI::getIccFileName(TQString profileName, TQString screenName, TQString kde_confdir) {
-	KSimpleConfig *t_config;
-	KSimpleConfig *t_systemconfig;
+	KSimpleConfig *t_config = NULL;
+	KSimpleConfig *t_systemconfig = NULL;
 	int t_numberOfProfiles;
 	TQStringList t_cfgProfiles;
 	TQString retval;
@ -109,11 +109,15 @@ TQString KRandrSimpleAPI::getIccFileName(TQString profileName, TQString screenNa
 	}

 	if (profileName != "") {
+		if (t_config) {
 			delete t_config;
 		}
+	}
 	else {
+		if (t_systemconfig) {
 			delete t_systemconfig;
 		}
+	}

 	return retval;
 }