diff options
| author | spholz <44805808+spholz@users.noreply.github.com> | 2021-08-12 22:27:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 22:27:17 +0200 |
| commit | 78a82495931e8c6b2161f79d2ac00ea88baea4f2 (patch) | |
| tree | 94480efdcd09a71e676782434a44d124002f835a /src/yuzu/main.cpp | |
| parent | 21743daf38f19160baa2da0e939a4e945dd57228 (diff) | |
| parent | 0509fe33775bfc2b0221732dfdf08860d47283fc (diff) | |
Merge branch 'yuzu-emu:master' into fix-lan-play
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 9544f0fb0..5940e0cfd 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -2814,8 +2814,6 @@ void GMainWindow::OnToggleFilterBar() { } void GMainWindow::OnCaptureScreenshot() { - OnPauseGame(); - const u64 title_id = Core::System::GetInstance().CurrentProcess()->GetTitleID(); const auto screenshot_path = QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::ScreenshotsDir)); @@ -2827,23 +2825,22 @@ void GMainWindow::OnCaptureScreenshot() { .arg(date); if (!Common::FS::CreateDir(screenshot_path.toStdString())) { - OnStartGame(); return; } #ifdef _WIN32 if (UISettings::values.enable_screenshot_save_as) { + OnPauseGame(); filename = QFileDialog::getSaveFileName(this, tr("Capture Screenshot"), filename, tr("PNG Image (*.png)")); + OnStartGame(); if (filename.isEmpty()) { - OnStartGame(); return; } } #endif render_window->CaptureScreenshot(UISettings::values.screenshot_resolution_factor.GetValue(), filename); - OnStartGame(); } // TODO: Written 2020-10-01: Remove per-game config migration code when it is irrelevant |