Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[desktop] Allow installation of keys from the initial warning box (#3402)

crueter283b94056df0
diff --git a/src/qt_common/util/content.cpp b/src/qt_common/util/content.cpp
index c190e11410..9ba5ab264c 100644
--- a/src/qt_common/util/content.cpp
+++ b/src/qt_common/util/content.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#include "qt_common/util/content.h"
@@ -267,9 +267,8 @@ void InstallKeys()
{},
QtCommon::Frontend::Option::ReadOnly);
- if (key_source_location.isEmpty()) {
+ if (key_source_location.isEmpty())
return;
- }
FirmwareManager::KeyInstallResult result
= FirmwareManager::InstallKeys(key_source_location.toStdString(), "keys");
diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cpp
index 62e410e3c5..85980b5396 100644
--- a/src/yuzu/main_window.cpp
+++ b/src/yuzu/main_window.cpp
@@ -4275,9 +4275,15 @@ void MainWindow::OnMouseActivity() {
void MainWindow::OnCheckFirmwareDecryption() {
if (!ContentManager::AreKeysPresent()) {
- QMessageBox::warning(this, tr("Derivation Components Missing"),
- tr("Encryption keys are missing."));
+ const auto res = QtCommon::Frontend::Warning(
+ tr("Derivation Components Missing"),
+ tr("Decryption keys are missing. Install them now?"),
+ QtCommon::Frontend::StandardButton::Yes | QtCommon::Frontend::StandardButton::No);
+
+ if (res == QtCommon::Frontend::StandardButton::Yes)
+ OnInstallDecryptionKeys();
}
+
SetFirmwareVersion();
UpdateMenuState();
}