CCF_100/suyu-mirror
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2025-08-31 16:36:34 -05:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into dev-fork

Browse Source
This commit is contained in:
Fijxu
2024-03-23 20:41:24 +01:00
parent bce23c24e0 649a90ff40
commit cb9f9da7b6
9 changed files with 127 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/app/src/main/res/values/arrays.xml
View File

@@ -142,7 +142,6 @@
<item>@string/ratio_force_four_three</item>
<item>@string/ratio_force_twenty_one_nine</item>
<item>@string/ratio_force_sixteen_ten</item>
<item>@string/ratio_thirty_two_nine</item>
<item>@string/ratio_stretch</item>
</string-array>
@@ -152,7 +151,6 @@
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
</integer-array>
<string-array name="rendererScalingFilterNames">

1
src/android/app/src/main/res/values/strings.xml
View File

@@ -601,7 +601,6 @@
<string name="ratio_force_four_three">Force 4:3</string>
<string name="ratio_force_twenty_one_nine">Force 21:9</string>
<string name="ratio_force_sixteen_ten">Force 16:10</string>
<string name="ratio_force_thirty_two_nine">Force 32:9</string>
<string name="ratio_stretch">Stretch to window</string>
<!-- CPU Backend -->

30
src/suyu/main.cpp
View File

@@ -12,6 +12,7 @@
#include <thread>
#include "core/hle/service/am/applet_manager.h"
#include "core/loader/nca.h"
#include "core/loader/nro.h"
#include "core/tools/renderdoc.h"
#ifdef __APPLE__
@@ -1747,18 +1748,21 @@ void GMainWindow::AllowOSSleep() {
}
bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletParameters params) {
if (!CheckFirmwarePresence()) {
QMessageBox::critical(this, tr("Component Missing"), tr("Missing Firmware."));
return false;
}
if (Loader::AppLoader_NRO::IdentifyType(
Core::GetGameFileFromPath(vfs, filename.toStdString())) != Loader::FileType::NRO) {
if (!CheckFirmwarePresence()) {
QMessageBox::critical(this, tr("Component Missing"), tr("Missing Firmware."));
return false;
}
if (!ContentManager::AreKeysPresent()) {
QMessageBox::warning(this, tr("Derivation Components Missing"),
tr("Encryption keys are missing. "
"In order to use this emulator"
"you need to provide your own encryption keys"
"in order to play them."));
return false;
if (!ContentManager::AreKeysPresent()) {
QMessageBox::warning(this, tr("Derivation Components Missing"),
tr("Encryption keys are missing. "
"In order to use this emulator, "
"you need to provide your own encryption keys "
"in order to play them."));
return false;
}
}
// Shutdown previous session if the emu thread is still active...
@@ -4630,8 +4634,8 @@ void GMainWindow::OnCheckFirmwareDecryption() {
if (!ContentManager::AreKeysPresent()) {
QMessageBox::warning(this, tr("Derivation Components Missing"),
tr("Encryption keys are missing. "
"In order to use this emulator"
"you need to provide your own encryption keys"
"In order to use this emulator, "
"you need to provide your own encryption keys "
"in order to play them."));
}