CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE redo new instance dialog

Browse Source
This commit is contained in:
Petr Mrázek
2018-03-19 02:36:12 +01:00
parent 4c7ea0f99a
commit 8e44ab2338
98 changed files with 1916 additions and 1254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/logic/minecraft/legacy/LegacyUpgradeTask.cpp
View File

@ -10,12 +10,9 @@
#include "minecraft/ComponentList.h"
#include "classparser.h"
LegacyUpgradeTask::LegacyUpgradeTask(SettingsObjectPtr settings, const QString & stagingPath, InstancePtr origInstance, const QString & newName)
LegacyUpgradeTask::LegacyUpgradeTask(InstancePtr origInstance)
{
m_globalSettings = settings;
m_stagingPath = stagingPath;
m_origInstance = origInstance;
m_newName = newName;
}
void LegacyUpgradeTask::executeTask()
@ -70,7 +67,7 @@ void LegacyUpgradeTask::copyFinished()
// NOTE: this scope ensures the instance is fully saved before we emitSucceeded
{
MinecraftInstance inst(m_globalSettings, instanceSettings, m_stagingPath);
inst.setName(m_newName);
inst.setName(m_instName);
inst.init();
QString preferredVersionNumber = decideVersion(legacyInst->currentVersionId(), legacyInst->intendedVersionId());

12
api/logic/minecraft/legacy/LegacyUpgradeTask.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "tasks/Task.h"
#include "InstanceTask.h"
#include "multimc_logic_export.h"
#include "net/NetJob.h"
#include <QUrl>
@ -13,11 +13,11 @@
class BaseInstanceProvider;
class MULTIMC_LOGIC_EXPORT LegacyUpgradeTask : public Task
class MULTIMC_LOGIC_EXPORT LegacyUpgradeTask : public InstanceTask
{
Q_OBJECT
public:
explicit LegacyUpgradeTask(SettingsObjectPtr settings, const QString & stagingPath, InstancePtr origInstance, const QString & newName);
explicit LegacyUpgradeTask(InstancePtr origInstance);
protected:
//! Entry point for tasks.
@ -26,13 +26,7 @@ protected:
void copyAborted();
private: /* data */
SettingsObjectPtr m_globalSettings;
InstancePtr m_origInstance;
QString m_stagingPath;
QString m_newName;
QFuture<bool> m_copyFuture;
QFutureWatcher<bool> m_copyFutureWatcher;
};