Merge pull request #422 from adobe/jeff/fix-6840

RaymondLim · RaymondLim · commit baef1f7686cd · 2014-02-12T11:38:45.000-08:00
Ensure that filenames returned when allowMultipleSelection = false are properly canonicalized
diff --git a/appshell/appshell_extensions_win.cpp b/appshell/appshell_extensions_win.cpp
@@ -543,7 +543,9 @@ int32 ShowOpenDialog(bool allowMultipleSelection,
 
             } else {
                 // If multiple files are not allowed, add the single file
-                selectedFiles->SetString(0, szFile);
+                std::wstring filePath(szFile);
+                ConvertToUnixPath(filePath);
+                selectedFiles->SetString(0, filePath);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,9 @@ int32 ShowOpenDialog(bool allowMultipleSelection,`
`543`	`543`
`544`	`544`	`} else {`
`545`	`545`	`// If multiple files are not allowed, add the single file`
`546`		`- selectedFiles->SetString(0, szFile);`
	`546`	`+ std::wstring filePath(szFile);`
	`547`	`+ ConvertToUnixPath(filePath);`
	`548`	`+ selectedFiles->SetString(0, filePath);`
`547`	`549`	`}`
`548`	`550`	`}`
`549`	`551`	`}`