N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qt: Fix loading screen metadata retention when title has no metadata. (#7215)

Browse source
This commit is contained in:
Steveice10 2023-11-28 14:15:44 -08:00 committed by GitHub
parent 0842ee6d7b
commit 9da78f6126
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/citra_qt/loading_screen.cpp
View file

@ -13,6 +13,7 @@
#include <QString> #include <QString>
#include <QStyleOption> #include <QStyleOption>
#include <QTime> #include <QTime>
#include <fmt/format.h>
#include "citra_qt/loading_screen.h" #include "citra_qt/loading_screen.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
@ -129,11 +130,17 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) {
if (loader.ReadIcon(buffer) == Loader::ResultStatus::Success) { if (loader.ReadIcon(buffer) == Loader::ResultStatus::Success) {
QPixmap icon = GetQPixmapFromSMDH(buffer); QPixmap icon = GetQPixmapFromSMDH(buffer);
ui->icon->setPixmap(icon); ui->icon->setPixmap(icon);
} else {
ui->icon->clear();
} }
std::string title; std::string title;
if (loader.ReadTitle(title) == Loader::ResultStatus::Success) { if (loader.ReadTitle(title) != Loader::ResultStatus::Success) {
ui->title->setText(tr("Now Loading\n%1").arg(QString::fromStdString(title))); u64 program_id;
if (loader.ReadProgramId(program_id) == Loader::ResultStatus::Success) {
title = fmt::format("{:016x}", program_id);
} }
}
ui->title->setText(tr("Now Loading\n%1").arg(QString::fromStdString(title)));
eta_shown = false; eta_shown = false;
OnLoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0); OnLoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0);
} }