summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-01-16 15:30:16 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-01-16 15:30:16 -0600
commit7f0c3f996ce51a50587f2499312688ca98f1a868 (patch)
treeba7c2129b061cbae04511592ce2bb3398d7b8bf2
parentb979556fbb9e880ed619abcb791e169b9a227486 (diff)
parentc1b662326338d960264edba69fcb4141073f97c7 (diff)
downloadtdelibs-7f0c3f996ce51a50587f2499312688ca98f1a868.tar.gz
tdelibs-7f0c3f996ce51a50587f2499312688ca98f1a868.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
-rw-r--r--krandr/libkrandr.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/krandr/libkrandr.cc b/krandr/libkrandr.cc
index 04dd01be6..923b9f1a0 100644
--- a/krandr/libkrandr.cc
+++ b/krandr/libkrandr.cc
@@ -433,14 +433,16 @@ TQStringList KRandrSimpleAPI::getDisplayConfigurationProfiles(TQString kde_confd
d.setSorting(TQDir::Name);
const TQFileInfoList *list = d.entryInfoList();
- TQFileInfoListIterator it(*list);
- TQFileInfo *fi;
+ if (list) {
+ TQFileInfoListIterator it(*list);
+ TQFileInfo *fi;
- while ((fi = it.current()) != 0) {
- if (fi->fileName() != "default") {
- ret.append(fi->fileName());
+ while ((fi = it.current()) != 0) {
+ if (fi->fileName() != "default") {
+ ret.append(fi->fileName());
+ }
+ ++it;
}
- ++it;
}
return ret;