mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Use desktop-hwnd as directorydialog-owner, fixes #6198

Browse Source 
Restore the mainwindow after the dialog. Correctly cleanup COM memory.
This commit is contained in:
Tomas Dittmann
2017-08-22 23:07:36 +02:00
committed by Michael Steenbeek
parent 5089dbe0c9
commit 841bc52027
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2-ui/UiContext.Win32.cpp
View File

@@ -164,7 +164,6 @@ namespace OpenRCT2 { namespace Ui
{
std::wstring titleW = String::ToUtf16(title);
BROWSEINFOW bi = { 0 };
bi.hwndOwner = GetHWND(window);
bi.lpszTitle = titleW.c_str();
bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE | BIF_NONEWFOLDERBUTTON;
@@ -173,12 +172,18 @@ namespace OpenRCT2 { namespace Ui
{
result = String::ToUtf8(SHGetPathFromIDListLongPath(pidl));
}
CoTaskMemFree(pidl);
}
else
{
log_error("Error opening directory browse window");
}
CoUninitialize();
// SHBrowseForFolderW might minimize the main window,
// so make sure that it's visible again.
ShowWindow(GetHWND(window), SW_RESTORE);
return result;
}