aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/flame/FlameInstanceCreationTask.h
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-08-02 20:27:37 +0100
committerGitHub <noreply@github.com>2023-08-02 20:27:37 +0100
commitafaf6f894c797fc0aa7eb329b661b533be469005 (patch)
tree0be358a0b616010aa5a022dbd3336a15cb791638 /launcher/modplatform/flame/FlameInstanceCreationTask.h
parent8b3c465a50e6be2a09c3968f1fd1e91b0428cbb0 (diff)
parentac36a2289faf331af17b51e2c9ebb78d005f9bfa (diff)
downloadPrismLauncher-afaf6f894c797fc0aa7eb329b661b533be469005.tar.gz
PrismLauncher-afaf6f894c797fc0aa7eb329b661b533be469005.tar.bz2
PrismLauncher-afaf6f894c797fc0aa7eb329b661b533be469005.zip
Merge branch 'PrismLauncher:develop' into better-component-installation
Diffstat (limited to 'launcher/modplatform/flame/FlameInstanceCreationTask.h')
-rw-r--r--launcher/modplatform/flame/FlameInstanceCreationTask.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.h b/launcher/modplatform/flame/FlameInstanceCreationTask.h
index 0ae4735b..603d3693 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.h
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.h
@@ -57,10 +57,7 @@ class FlameCreationTask final : public InstanceCreationTask {
QString id,
QString version_id,
QString original_instance_id = {})
- : InstanceCreationTask()
- , m_parent(parent)
- , m_managed_id(std::move(id))
- , m_managed_version_id(std::move(version_id))
+ : InstanceCreationTask(), m_parent(parent), m_managed_id(std::move(id)), m_managed_version_id(std::move(version_id))
{
setStagingPath(staging_path);
setParentSettings(global_settings);
@@ -78,6 +75,7 @@ class FlameCreationTask final : public InstanceCreationTask {
void setupDownloadJob(QEventLoop&);
void copyBlockedMods(QList<BlockedMod> const& blocked_mods);
void validateZIPResouces();
+ QString getVersionForLoader(QString uid, QString loaderType, QString version, QString mcVersion);
private:
QWidget* m_parent = nullptr;