mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2025-06-13 05:37:42 +02:00
change java on modpack update (#3379)
This commit is contained in:
@ -43,6 +43,7 @@
|
|||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
#include "Application.h"
|
||||||
#include "settings/INISettingsObject.h"
|
#include "settings/INISettingsObject.h"
|
||||||
#include "settings/OverrideSetting.h"
|
#include "settings/OverrideSetting.h"
|
||||||
#include "settings/Setting.h"
|
#include "settings/Setting.h"
|
||||||
@ -173,6 +174,12 @@ void BaseInstance::copyManagedPack(BaseInstance& other)
|
|||||||
m_settings->set("ManagedPackName", other.getManagedPackName());
|
m_settings->set("ManagedPackName", other.getManagedPackName());
|
||||||
m_settings->set("ManagedPackVersionID", other.getManagedPackVersionID());
|
m_settings->set("ManagedPackVersionID", other.getManagedPackVersionID());
|
||||||
m_settings->set("ManagedPackVersionName", other.getManagedPackVersionName());
|
m_settings->set("ManagedPackVersionName", other.getManagedPackVersionName());
|
||||||
|
|
||||||
|
if (APPLICATION->settings()->get("AutomaticJavaSwitch").toBool() && m_settings->get("AutomaticJava").toBool() &&
|
||||||
|
m_settings->get("OverrideJavaLocation").toBool()) {
|
||||||
|
m_settings->set("OverrideJavaLocation", false);
|
||||||
|
m_settings->set("JavaPath", "");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int BaseInstance::getConsoleMaxLines() const
|
int BaseInstance::getConsoleMaxLines() const
|
||||||
|
Reference in New Issue
Block a user