mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-10 05:38:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

QT: Fix PR 2662 (#2676)
Some checks failed
Build and Release / reuse (push) Waiting to run
Build and Release / clang-format (push) Waiting to run
Build and Release / get-info (push) Waiting to run
Build and Release / windows-sdl (push) Blocked by required conditions
Build and Release / windows-qt (push) Blocked by required conditions
Build and Release / macos-sdl (push) Blocked by required conditions
Build and Release / macos-qt (push) Blocked by required conditions
Build and Release / linux-sdl (push) Blocked by required conditions
Build and Release / linux-qt (push) Blocked by required conditions
Build and Release / linux-sdl-gcc (push) Blocked by required conditions
Build and Release / linux-qt-gcc (push) Blocked by required conditions
Build and Release / pre-release (push) Blocked by required conditions
Update Translation / Update Translation (push) Failing after 12m55s

Browse Source
This commit is contained in:
DanielSvoboda
2025-03-23 18:25:11 -03:00
committed by GitHub
parent 99332e4ec2
commit 10bf3d383c
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt_gui/main.cpp
View File

@@ -157,8 +157,13 @@ int main(int argc, char* argv[]) {
}
}
bool allInstallDirsDisabled =
std::all_of(Config::getGameInstallDirsEnabled().begin(),
Config::getGameInstallDirsEnabled().end(), [](bool val) { return !val; });
// If no game directory is set and no command line argument, prompt for it
if (Config::getGameInstallDirs().empty() && !has_command_line_argument) {
if (Config::getGameInstallDirs().empty() && allInstallDirsDisabled &&
!has_command_line_argument) {
GameInstallDialog dlg;
dlg.exec();
}

2
src/qt_gui/settings_dialog.cpp
View File

@@ -821,7 +821,7 @@ void SettingsDialog::ResetInstallFolders() {
std::vector<bool> install_dirs_enabled;
try {
install_dirs_enabled = toml::find<std::vector<bool>>(gui, "installDirsEnabled");
install_dirs_enabled = Config::getGameInstallDirsEnabled();
} catch (...) {
// If it does not exist, assume that all are enabled.
install_dirs_enabled.resize(install_dir_array.size(), true);