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

12 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,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;