diff options
Diffstat (limited to '')
| m--------- | externals/dynarmic | 0 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 8 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/externals/dynarmic b/externals/dynarmic -Subproject 4f967387c07365b7ea35d2fa3e19b7df8872a09 +Subproject e7166e8ba74d7b9c85e87afc0aaf667e7e84cfe diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index bbbd96113..9e6125e18 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -212,7 +212,7 @@ const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> Config::default // UISetting::values.shortcuts, which is alphabetically ordered. // clang-format off const std::array<UISettings::Shortcut, 16> Config::default_hotkeys{{ - {QStringLiteral("Capture Screenshot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+P"), Qt::ApplicationShortcut}}, + {QStringLiteral("Capture Screenshot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+P"), Qt::WidgetWithChildrenShortcut}}, {QStringLiteral("Change Docked Mode"), QStringLiteral("Main Window"), {QStringLiteral("F10"), Qt::ApplicationShortcut}}, {QStringLiteral("Continue/Pause Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F4"), Qt::WindowShortcut}}, {QStringLiteral("Decrease Speed Limit"), QStringLiteral("Main Window"), {QStringLiteral("-"), Qt::ApplicationShortcut}}, @@ -665,11 +665,13 @@ void Config::ReadShortcutValues() { const auto& [keyseq, context] = shortcut; qt_config->beginGroup(group); qt_config->beginGroup(name); + // No longer using ReadSetting for shortcut.second as it innacurately returns a value of 1 + // for WidgetWithChildrenShortcut which is a value of 3. Needed to fix screenshot shortcut + // in windowed mode UISettings::values.shortcuts.push_back( {name, group, - {ReadSetting(QStringLiteral("KeySeq"), keyseq).toString(), - ReadSetting(QStringLiteral("Context"), context).toInt()}}); + {ReadSetting(QStringLiteral("KeySeq"), keyseq).toString(), shortcut.second}}); qt_config->endGroup(); qt_config->endGroup(); } 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(); } }); |