Skip to content

[pull] master from mgba-emu:master #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Jan 23, 2026
Merged

[pull] master from mgba-emu:master #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c927675
Qt: Add working directory to report view
endrift Jan 23, 2026
869aa38
Qt: Allow downgrading across update channels
endrift Jan 23, 2026
54e50bd
Qt: Switch updater to using cache dir, for forward compat
endrift Jan 23, 2026
aea9d20
Qt: Use QCoreApplication::application*Path instead of inspecting argv…
endrift Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ Misc:
- Qt: Allow menu bar to be temporarily hidden (closes mgba.io/i/1448)
- Qt: Add warning when a ROM is loaded from a temporary directory
- Qt: Sort shader uniforms based on order in file
- Qt: Allow downgrading across update channels
- Res: Port hq2x and OmniScale shaders from SameBoy
- Res: Port NSO-gba-colors shader (closes mgba.io/i/2834)
- Res: Update gba-colors shader (closes mgba.io/i/2976)
Expand Down
10 changes: 5 additions & 5 deletions src/platform/qt/ApplicationUpdater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ApplicationUpdater::ApplicationUpdater(ConfigController* config, QObject* parent
m_lastCheck = QDateTime::currentDateTimeUtc();
config->setQtOption("lastUpdateCheck", m_lastCheck);

if (available && currentVersion() < updateInfo()) {
if (available && (currentVersion() < updateInfo() || m_channel != currentChannel())) {
ApplicationUpdatePrompt* prompt = new ApplicationUpdatePrompt;
connect(prompt, &QDialog::accepted, GBAApp::app(), &GBAApp::restartForUpdate);
prompt->setAttribute(Qt::WA_DeleteOnClose);
Expand All @@ -53,9 +53,9 @@ ApplicationUpdater::ApplicationUpdater(ConfigController* config, QObject* parent
});

connect(this, &AbstractUpdater::updateDone, this, [this, config]() {
QByteArray arg0 = GBAApp::app()->arguments().at(0).toUtf8();
QByteArray exe = GBAApp::applicationFilePath().toUtf8();
QByteArray path = updateInfo().url.path().toUtf8();
mUpdateRegister(config->config(), arg0.constData(), path.constData());
mUpdateRegister(config->config(), exe.constData(), path.constData());
config->write();
});
}
Expand Down Expand Up @@ -153,8 +153,8 @@ QString ApplicationUpdater::destination() const {

const char* ApplicationUpdater::platform() {
#ifdef Q_OS_WIN
QFileInfo exe(GBAApp::app()->arguments().at(0));
QFileInfo uninstallInfo(exe.dir().filePath("unins000.dat"));
QDir appdir(QCoreApplication::applicationDirPath());
QFileInfo uninstallInfo(appdir.filePath("unins000.dat"));
#ifdef Q_OS_WIN64
return uninstallInfo.exists() ? "win64-installer" : "win64";
#elif defined(Q_OS_WIN32)
Expand Down
6 changes: 3 additions & 3 deletions src/platform/qt/GBAApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,12 +369,12 @@ void GBAApp::cleanupAfterUpdate() {

void GBAApp::restartForUpdate() {
QFileInfo updaterPath(m_updater.updateInfo().url.path());
QDir configDir(ConfigController::configDir());
QDir cacheDir(ConfigController::cacheDir());
if (updaterPath.suffix() == "exe") {
m_invokeOnExit = configDir.filePath(QLatin1String("update.exe"));
m_invokeOnExit = cacheDir.filePath(QLatin1String("update.exe"));
} else {
QFile updater(":/updater");
QString extractedPath = configDir.filePath(QLatin1String("updater"));
QString extractedPath = cacheDir.filePath(QLatin1String("updater"));
#ifdef Q_OS_WIN
extractedPath += ".exe";
#endif
Expand Down
1 change: 1 addition & 0 deletions src/platform/qt/ReportView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ void ReportView::generateReport() {
QStringList swReport;
swReport << QString("Name: %1").arg(QLatin1String(projectName));
swReport << QString("Executable location: %1").arg(redact(QCoreApplication::applicationFilePath()));
swReport << QString("Working directory: %1").arg(redact(QDir::currentPath()));
swReport << QString("Portable: %1").arg(yesNo[ConfigController::isPortable()]);
swReport << QString("Configuration directory: %1").arg(redact(configDir.path()));
swReport << QString("Version: %1").arg(QLatin1String(projectVersion));
Expand Down