diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index b037fc055a..9a792c662f 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml @@ -28,7 +28,7 @@ SPDX-License-Identifier: GPL-3.0-or-later android:banner="@drawable/tv_banner" android:fullBackupContent="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules_api_31" - android:enableOnBackInvokedCallback="true"> + android:enableOnBackInvokedCallback="false"> diff --git a/src/core/hle/service/am/process_creation.cpp b/src/core/hle/service/am/process_creation.cpp index 517f6a4bb1..aaa03c4c39 100644 --- a/src/core/hle/service/am/process_creation.cpp +++ b/src/core/hle/service/am/process_creation.cpp @@ -101,7 +101,7 @@ std::unique_ptr CreateApplicationProcess(std::vector& out_control, out_control = nacp.GetRawBytes(); } else { out_control.resize(sizeof(FileSys::RawNACP)); - std::fill(out_control.begin(), out_control.end(), 0); + std::fill(out_control.begin(), out_control.end(), (u8) 0); } auto& storage = system.GetContentProviderUnion(); diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index e84ab5cc35..a419fa4f08 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -364,7 +364,7 @@ GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvid }); // We must register all custom types with the Qt Automoc system so that we are able to use - // it with signals/slots. In this case, QList falls under the umbrells of custom types. + // it with signals/slots. In this case, QList falls under the umbrella of custom types. qRegisterMetaType>("QList"); layout->setContentsMargins(0, 0, 0, 0); @@ -375,12 +375,12 @@ GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvid pre_alpha_warning->setText( tr("IMPORTANT: Eden is PRE-ALPHA SOFTWARE and is not meant to be used by or get shared to the public just yet; " "Bugs and unfinished features are expected to be present at this stage.")); + pre_alpha_warning->setWordWrap(true); pre_alpha_warning->setOpenExternalLinks(true); pre_alpha_warning->setStyleSheet( QString::fromStdString("color: black; font-weight: bold;")); warning_layout->addWidget(pre_alpha_warning); - warning_layout->addStretch(); warning_layout->setContentsMargins(3, 3, 3, 3); warning_widget = new QWidget; warning_widget->setStyleSheet(QString::fromStdString("background-color: khaki;"));