External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 17:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Sebastian
2022-05-21 18:29:00 -05:00
parent a3b3598666 66e165f4b8
commit c75ae2b218
128 changed files with 4816 additions and 3028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
launcher/LaunchController.cpp
View File

@@ -16,6 +16,7 @@
#include <QHostInfo>
#include <QList>
#include <QHostAddress>
#include <QPushButton>
#include "BuildConfig.h"
#include "JavaCommon.h"
@@ -35,7 +36,10 @@ void LaunchController::executeTask()
return;
}
JavaCommon::checkJVMArgs(m_instance->settings()->get("JvmArgs").toString(), m_parentWidget);
if(!JavaCommon::checkJVMArgs(m_instance->settings()->get("JvmArgs").toString(), m_parentWidget)) {
emitFailed(tr("Invalid Java arguments specified. Please fix this first."));
return;
}
login();
}
@@ -171,6 +175,18 @@ void LaunchController::login() {
emitFailed(errorString);
return;
}
case AccountState::MustMigrate: {
auto errorString = tr("The account must be migrated to a Microsoft account.");
QMessageBox::warning(
m_parentWidget,
tr("Account requires migration"),
errorString,
QMessageBox::StandardButton::Ok,
QMessageBox::StandardButton::Ok
);
emitFailed(errorString);
return;
}
}
}
emitFailed(tr("Failed to launch."));