franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8107 from german77/fullscreen

Browse Source 
yuzu: Only override fullscreen setting if gamepath or argument is provided
This commit is contained in:
bunnei 2022-03-29 17:43:10 -07:00 committed by GitHub
commit 8e9d253687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/yuzu/main.cpp
View File

@ -293,8 +293,6 @@ GMainWindow::GMainWindow()
MigrateConfigFiles(); MigrateConfigFiles();
ui->action_Fullscreen->setChecked(false);
#if defined(HAVE_SDL2) && !defined(_WIN32) #if defined(HAVE_SDL2) && !defined(_WIN32)
SDL_InitSubSystem(SDL_INIT_VIDEO); SDL_InitSubSystem(SDL_INIT_VIDEO);
// SDL disables the screen saver by default, and setting the hint // SDL disables the screen saver by default, and setting the hint
@ -312,17 +310,20 @@ GMainWindow::GMainWindow()
} }
QString game_path; QString game_path;
bool has_gamepath = false;
bool is_fullscreen = false;
for (int i = 1; i < args.size(); ++i) { for (int i = 1; i < args.size(); ++i) {
// Preserves drag/drop functionality // Preserves drag/drop functionality
if (args.size() == 2 && !args[1].startsWith(QChar::fromLatin1('-'))) { if (args.size() == 2 && !args[1].startsWith(QChar::fromLatin1('-'))) {
game_path = args[1]; game_path = args[1];
has_gamepath = true;
break; break;
} }
// Launch game in fullscreen mode // Launch game in fullscreen mode
if (args[i] == QStringLiteral("-f")) { if (args[i] == QStringLiteral("-f")) {
ui->action_Fullscreen->setChecked(true); is_fullscreen = true;
continue; continue;
} }
@ -365,9 +366,15 @@ GMainWindow::GMainWindow()
} }
game_path = args[++i]; game_path = args[++i];
has_gamepath = true;
} }
} }
// Override fullscreen setting if gamepath or argument is provided
if (has_gamepath || is_fullscreen) {
ui->action_Fullscreen->setChecked(is_fullscreen);
}
if (!game_path.isEmpty()) { if (!game_path.isEmpty()) {
BootGame(game_path); BootGame(game_path);
} }