mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-10-06 06:50:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4841 from arthomnix/create-shortcut-old-qt-fix

Browse Source 
NOISSUE Yeet the version check for shortcut creation
This commit is contained in:
Petr Mrázek 2022-07-19 18:32:49 +02:00 committed by GitHub
commit b88296029b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
launcher/ui/dialogs/CreateShortcutDialog.cpp
View File

@ -41,30 +41,7 @@ CreateShortcutDialog::CreateShortcutDialog(QWidget *parent, InstancePtr instance
ui->profileComboBox->setCurrentText(accounts->defaultAccount()->profileName());
}
// check if instance is affected by a bug causing it to crash when trying to join a server on launch
// TODO: implement this check in meta
if (m_instance->typeName() == "Minecraft")
{
try
{
MinecraftInstancePtr minecraftInstance = qobject_pointer_cast<MinecraftInstance>(m_instance);
minecraftInstance->getPackProfile()->reload(Net::Mode::Online);
QDateTime versionDate = minecraftInstance->getPackProfile()->getComponent("net.minecraft")->getReleaseDateTime();
bool enableJoinServer = (versionDate < MC_145102_START)
|| (versionDate >= MC_145102_END && versionDate < MC_228828_START)
|| (versionDate >= MC_228828_END);
ui->joinServerCheckBox->setEnabled(enableJoinServer);
ui->joinServer->setEnabled(enableJoinServer);
}
catch (const Exception &e)
{
QMessageBox::critical(this, tr("Error"), e.cause());
}
catch (...)
{
QMessageBox::critical(this, tr("Error"), tr("Failed to load pack profile to check version!"));
}
}
// TODO: check if version is affected by crashing when joining servers on launch, ideally in meta
// Macs don't have any concept of a desktop shortcut, so force-enable the option to generate a shell script instead
#if defined(Q_OS_UNIX) && !defined(Q_OS_LINUX)

6
launcher/ui/dialogs/CreateShortcutDialog.h
View File

@ -16,12 +16,6 @@
#include <windows.h>
#endif
// Dates when the game was affected by bugs that crashed the game when using the option to join a server on startup
const QDateTime MC_145102_START = timeFromS3Time("2019-02-20T14:56:58+00:00");
const QDateTime MC_145102_END = timeFromS3Time("2020-05-14T08:16:26+00:00");
const QDateTime MC_228828_START = timeFromS3Time("2021-03-10T15:24:38+00:00");
const QDateTime MC_228828_END = timeFromS3Time("2021-06-18T12:24:40+00:00");
namespace Ui
{
class CreateShortcutDialog;