Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

13 years ago · 7f0c3f996c
parent b979556fbb c1b6623263
commit 7f0c3f996c
1 changed files with 8 additions and 6 deletions
--- a/krandr/libkrandr.cc
+++ b/krandr/libkrandr.cc
@ -433,6 +433,7 @@ TQStringList KRandrSimpleAPI::getDisplayConfigurationProfiles(TQString kde_confd
 	d.setSorting(TQDir::Name);

 	const TQFileInfoList *list = d.entryInfoList();
+	if (list) {
 		TQFileInfoListIterator it(*list);
 		TQFileInfo *fi;

@ -442,6 +443,7 @@ TQStringList KRandrSimpleAPI::getDisplayConfigurationProfiles(TQString kde_confd
 			}
 			++it;
 		}
+	}

 	return ret;
 }