Merge pull request #598 from JLouis-B/filePicker_fixes

Win32Core::openFilePicker fixes
ivansafrin · Dec 28, 2014 · 4eb4f1a · 4eb4f1a · fodinabor · Dec 29, 2014
2 parents aa68c6d + 025a8c4
commit 4eb4f1a
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/Core/Contents/Source/PolyWinCore.cpp b/Core/Contents/Source/PolyWinCore.cpp
@@ -1150,16 +1150,35 @@ std::vector<String> Win32Core::openFilePicker(std::vector<CoreFileExtension> ext
 	ofn.lpstrInitialDir=NULL;
 
 	if(allowMultiple) {
-		ofn.Flags = OFN_PATHMUSTEXIST|OFN_FILEMUSTEXIST|OFN_EXPLORER;
-	} else {
 		ofn.Flags = OFN_PATHMUSTEXIST|OFN_FILEMUSTEXIST|OFN_ALLOWMULTISELECT|OFN_EXPLORER;
+	} else {
+		ofn.Flags = OFN_PATHMUSTEXIST|OFN_FILEMUSTEXIST|OFN_EXPLORER;
 	}
 
 	std::vector<String> retVec;
 
 	if(GetOpenFileName(&ofn)) {
 		if(allowMultiple) {
-
+			String path = fBuffer;
+
+			std::string buf;
+			for (int i = ofn.nFileOffset; i < sizeof( fBuffer ); i++)
+			{
+				if (fBuffer[i] != NULL)
+					buf.push_back(fBuffer[i]);
+				else if (fBuffer[i-1] != NULL)
+				{
+					retVec.push_back(path + "/" + buf);
+					buf = "";
+				}
+				else // 2 NULL characters = no more files
+					break;
+			}
+			if (retVec.size() == 1)
+			{
+				retVec.clear();
+				retVec.push_back(path); // If only 1 file selected, path is the full path of the file
+			}
 		} else {
 			retVec.push_back(String(fBuffer));
 		}