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

NOISSUE make instance creation task abortable

Browse Source 
This may or may not expose issues when it actually IS used.
This commit is contained in:
Petr Mrázek 2018-12-10 20:49:21 +01:00
parent 3018310be3
commit fb29e45bd0
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/logic/InstanceList.cpp
View File

@ -714,6 +714,25 @@ public:
virtual ~InstanceStaging() {}; virtual ~InstanceStaging() {};
// FIXME/TODO: add ability to abort during instance commit retries
bool abort() override
{
if(m_child)
{
return m_child->abort();
}
return false;
}
bool canAbort() const override
{
if(m_child)
{
return m_child->canAbort();
}
return false;
}
protected: protected:
virtual void executeTask() override virtual void executeTask() override
{ {
@ -727,6 +746,7 @@ protected:
private slots: private slots:
void childSucceded() void childSucceded()
{ {
m_child.reset();
unsigned sleepTime = backoff(); unsigned sleepTime = backoff();
if(m_parent->commitStagedInstance(m_stagingPath, m_instanceName, m_groupName)) if(m_parent->commitStagedInstance(m_stagingPath, m_instanceName, m_groupName))
{ {
@ -744,6 +764,7 @@ private slots:
} }
void childFailed(const QString & reason) void childFailed(const QString & reason)
{ {
m_child.reset();
m_parent->destroyStagingPath(m_stagingPath); m_parent->destroyStagingPath(m_stagingPath);
emitFailed(reason); emitFailed(reason);
} }