summaryrefslogtreecommitdiffstats
path: root/krandr
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-22 22:53:55 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-11-23 16:31:00 +0100
commit789419095779a22de10156ca04a1f864cd0399cd (patch)
treec47e213f1ddbd365f16c214b30bb4a12ad3fb249 /krandr
parent205b3397710e08554fe2be67dee5fa4876e8d234 (diff)
downloadtdelibs-789419095779a22de10156ca04a1f864cd0399cd.tar.gz
tdelibs-789419095779a22de10156ca04a1f864cd0399cd.zip
Fix display configuration module crash
This pertains to Bug 1334 (cherry picked from commit 1d811a999daaad4b36130e54f908cb030b598d6b)
Diffstat (limited to 'krandr')
-rw-r--r--krandr/libkrandr.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/krandr/libkrandr.cc b/krandr/libkrandr.cc
index b4f21e5fe..e1048969c 100644
--- 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,10 +109,14 @@ TQString KRandrSimpleAPI::getIccFileName(TQString profileName, TQString screenNa
}
if (profileName != "") {
- delete t_config;
+ if (t_config) {
+ delete t_config;
+ }
}
else {
- delete t_systemconfig;
+ if (t_systemconfig) {
+ delete t_systemconfig;
+ }
}
return retval;