mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Reverted a mistake in a win32 file chooser function.

Browse source
This commit is contained in:
jules 2015-06-29 11:20:51 +01:00
parent e19abddeb1
commit 8c64ab5391
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_core/system/juce_PlatformDefs.h
View file

@ -63,7 +63,7 @@
//==============================================================================
#if JUCE_IOS || JUCE_LINUX || JUCE_ANDROID || JUCE_PPC
/** This will try to break into the debugger if the app is currently being debugged.
If called by an app that's not being debugged, the behaviour isn't defined - it may
If called by an app that's not being debugged, the behaviour isn't defined - it may
crash or not, depending on the platform.
@see jassert()
*/

6
modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
View file

@ -218,8 +218,6 @@ void FileChooser::showPlatformDialog (Array<File>& results, const String& title_
info.customComponent->enterModalState();
}
const StringRef separatorTokens (";,|");
const size_t filterSpaceNumChars = 2048;
HeapBlock<WCHAR> filters;
filters.calloc (filterSpaceNumChars);
@ -228,7 +226,7 @@ void FileChooser::showPlatformDialog (Array<File>& results, const String& title_
((filterSpaceNumChars - 1) * sizeof (WCHAR) - bytesWritten));
for (int i = 0; i < filterSpaceNumChars; ++i)
if (separatorTokens.text.indexOf ((juce_wchar) filters[i]) >= 0)
if (filters[i] == '|')
filters[i] = 0;
OPENFILENAMEW of = { 0 };
@ -255,7 +253,7 @@ void FileChooser::showPlatformDialog (Array<File>& results, const String& title_
if (isSaveDialogue)
{
StringArray tokens;
tokens.addTokens (filter, separatorTokens, "\"'");
tokens.addTokens (filter, ";,", "\"'");
tokens.trim();
tokens.removeEmptyStrings();