ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/project64/project64 into develop

This commit is contained in:
zilmar 2023-02-14 08:26:56 +10:30
parent 4263f11c17 3aef396007
commit ee3f092ec9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64/UserInterface/RomBrowser.cpp
View File

@ -1101,7 +1101,7 @@ void CRomBrowser::SelectRomDir(void)
bi.pidlRoot = nullptr;
bi.pszDisplayName = SelectedDir;
bi.lpszTitle = title.c_str();
bi.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
bi.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
bi.lpfn = (BFFCALLBACK)SelectRomDirCallBack;
bi.lParam = (uint32_t)RomDir.c_str();
WriteTrace(TraceUserInterface, TraceDebug, "2");

2
Source/Project64/UserInterface/Settings/SettingsPage-Directories.cpp
View File

@ -73,7 +73,7 @@ void COptionsDirectoriesPage::SelectDirectory(LanguageStringID Title, CModifiedE
bi.pidlRoot = nullptr;
bi.pszDisplayName = Buffer;
bi.lpszTitle = wTitle.c_str();
bi.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
bi.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
bi.lpfn = (BFFCALLBACK)SelectDirCallBack;
bi.lParam = (DWORD)InitialDir.c_str();
if ((pidl = SHBrowseForFolder(&bi)) != nullptr)

2
Source/Project64/UserInterface/WelcomeScreen.cpp
View File

@ -19,7 +19,7 @@ void WelcomeScreen::SelectGameDir(UINT /*Code*/, int /*id*/, HWND /*ctl*/)
bi.pidlRoot = nullptr;
bi.pszDisplayName = Buffer;
bi.lpszTitle = wTitle.c_str();
bi.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
bi.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
bi.lpfn = (BFFCALLBACK)SelectDirCallBack;
bi.lParam = (LPARAM)InitialDir.c_str();
if ((pidl = SHBrowseForFolder(&bi)) != nullptr)