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

refactor+fix: use QSharedPointer for shared_qobject_ptr

Browse Source 
Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow
2022-08-04 13:58:30 -03:00
parent 6fd3672618
commit 362ecdb583
7 changed files with 37 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/minecraft/MinecraftUpdate.cpp
View File

@ -43,7 +43,7 @@ void MinecraftUpdate::executeTask()
m_tasks.clear();
// create folders
{
m_tasks.append(std::make_shared<FoldersTask>(m_inst));
m_tasks.append(new FoldersTask(m_inst));
}
// add metadata update task if necessary
@ -53,23 +53,23 @@ void MinecraftUpdate::executeTask()
auto task = components->getCurrentTask();
if(task)
{
m_tasks.append(task.unwrap());
m_tasks.append(task);
}
}
// libraries download
{
m_tasks.append(std::make_shared<LibrariesTask>(m_inst));
m_tasks.append(new LibrariesTask(m_inst));
}
// FML libraries download and copy into the instance
{
m_tasks.append(std::make_shared<FMLLibrariesTask>(m_inst));
m_tasks.append(new FMLLibrariesTask(m_inst));
}
// assets update
{
m_tasks.append(std::make_shared<AssetUpdateTask>(m_inst));
m_tasks.append(new AssetUpdateTask(m_inst));
}
if(!m_preFailure.isEmpty())

2
launcher/minecraft/MinecraftUpdate.h
View File

@ -50,7 +50,7 @@ private:
private:
MinecraftInstance *m_inst = nullptr;
QList<std::shared_ptr<Task>> m_tasks;
QList<Task::Ptr> m_tasks;
QString m_preFailure;
int m_currentTask = -1;
bool m_abort = false;

2
launcher/minecraft/auth/MinecraftAccount.cpp
View File

@ -238,7 +238,7 @@ void MinecraftAccount::authFailed(QString reason)
}
bool MinecraftAccount::isActive() const {
return m_currentTask;
return !m_currentTask.isNull();
}
bool MinecraftAccount::shouldRefresh() const {