mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2026-01-08 09:31:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-1273 Common Item Dialog does not open when wrong path to directory is passed

Browse Source 
Handle set directory / set file properly

(cherry picked from commit b96492f7de)
This commit is contained in:
Vyacheslav Moklev
2019-03-14 13:31:43 +03:00
committed by jbrbot
parent c4b2f712f5
commit 1aea5f877c
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp
View File

@@ -749,16 +749,23 @@ AwtFileDialog::Show(void *p)
OLE_HRT(pfd->SetFileTypes(s_fileFilterCount, s_fileFilterSpec));
OLE_HRT(pfd->SetFileTypeIndex(1));
IShellItemPtr directoryItem;
OLE_NEXT_TRY
OLE_HRT(CreateShellItem(directoryBuffer, directoryItem));
OLE_HRT(pfd->SetFolder(directoryItem));
OLE_CATCH
CoTaskStringHolder shortName = GetShortName(fileBuffer);
if (shortName) {
OLE_HRT(pfd->SetFileName(shortName));
{
IShellItemPtr directoryItem;
OLE_TRY
OLE_HRT(CreateShellItem(directoryBuffer, directoryItem));
OLE_HRT(pfd->SetFolder(directoryItem));
OLE_CATCH
}
{
CoTaskStringHolder shortName = GetShortName(fileBuffer);
if (shortName) {
OLE_TRY
OLE_HRT(pfd->SetFileName(shortName));
OLE_CATCH
}
}
OLE_CATCH
}