summaryrefslogtreecommitdiff
path: root/src/yuzu/main.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-07-06 23:09:52 -0400
committerGitHub <noreply@github.com>2020-07-06 23:09:52 -0400
commit155c8ba04c9ac70b409517705ead408d9b0f4045 (patch)
tree88265573414ac59d35fede9377ab96042b0b07eb /src/yuzu/main.cpp
parent52882a93a5071bf9078e6d90d36914a614fa14e9 (diff)
parent40cf9288e9814d022bfbe247d1948e08c1a655d6 (diff)
Merge pull request #4258 from ameerj/master
configuration: Fix hotkeys that open file dialog in windowed mode
Diffstat (limited to 'src/yuzu/main.cpp')
-rw-r--r--src/yuzu/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index fb299a39b..9844e4764 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -753,7 +753,7 @@ void GMainWindow::InitializeHotkeys() {
});
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Capture Screenshot"), this),
&QShortcut::activated, this, [&] {
- if (emu_thread->IsRunning()) {
+ if (emu_thread != nullptr && emu_thread->IsRunning()) {
OnCaptureScreenshot();
}
});