aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/VanillaInstanceCreationTask.cpp
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:04:53 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:04:53 +0300
commit91eb30f03795921b48360b79bdb739dcd0f10f17 (patch)
tree1a2fccbbbf4751cf2cf6f6418cb525dcee5f2acd /launcher/minecraft/VanillaInstanceCreationTask.cpp
parenta3ffa6455021b69bd1940b65fefb3b6177c96730 (diff)
parentae793f6cf11658c9abc5111e82d5ba7b3e6af127 (diff)
downloadPrismLauncher-91eb30f03795921b48360b79bdb739dcd0f10f17.tar.gz
PrismLauncher-91eb30f03795921b48360b79bdb739dcd0f10f17.tar.bz2
PrismLauncher-91eb30f03795921b48360b79bdb739dcd0f10f17.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog
Diffstat (limited to 'launcher/minecraft/VanillaInstanceCreationTask.cpp')
-rw-r--r--launcher/minecraft/VanillaInstanceCreationTask.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/launcher/minecraft/VanillaInstanceCreationTask.cpp b/launcher/minecraft/VanillaInstanceCreationTask.cpp
index 0bb92e87..ccbd8c67 100644
--- a/launcher/minecraft/VanillaInstanceCreationTask.cpp
+++ b/launcher/minecraft/VanillaInstanceCreationTask.cpp
@@ -8,7 +8,11 @@
#include "settings/INISettingsObject.h"
VanillaCreationTask::VanillaCreationTask(BaseVersion::Ptr version, QString loader, BaseVersion::Ptr loader_version)
- : InstanceCreationTask(), m_version(std::move(version)), m_using_loader(true), m_loader(std::move(loader)), m_loader_version(std::move(loader_version))
+ : InstanceCreationTask()
+ , m_version(std::move(version))
+ , m_using_loader(true)
+ , m_loader(std::move(loader))
+ , m_loader_version(std::move(loader_version))
{}
bool VanillaCreationTask::createInstance()
@@ -22,7 +26,7 @@ bool VanillaCreationTask::createInstance()
auto components = inst.getPackProfile();
components->buildingFromScratch();
components->setComponentVersion("net.minecraft", m_version->descriptor(), true);
- if(m_using_loader)
+ if (m_using_loader)
components->setComponentVersion(m_loader, m_loader_version->descriptor());
inst.setName(name());