summaryrefslogtreecommitdiffstats
path: root/libmultimc/src
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-06-23 01:25:05 +0200
committerPetr Mrázek <peterix@gmail.com>2013-06-23 01:25:05 +0200
commitd9195bff3a6088bb0f116d61fc8c961e3ba4e3f2 (patch)
tree4b3f62064936f93775f09db0bb5a79b82c58b99e /libmultimc/src
parent929698ff15bdd44a5bd8d8b5c1e13be9c55a1cac (diff)
downloadMultiMC-d9195bff3a6088bb0f116d61fc8c961e3ba4e3f2.tar
MultiMC-d9195bff3a6088bb0f116d61fc8c961e3ba4e3f2.tar.gz
MultiMC-d9195bff3a6088bb0f116d61fc8c961e3ba4e3f2.tar.lz
MultiMC-d9195bff3a6088bb0f116d61fc8c961e3ba4e3f2.tar.xz
MultiMC-d9195bff3a6088bb0f116d61fc8c961e3ba4e3f2.zip
Fix crashes from uninitialized variables, small naming fix for smart pointers
Diffstat (limited to 'libmultimc/src')
-rw-r--r--libmultimc/src/gameupdatetask.cpp6
-rw-r--r--libmultimc/src/minecraftversionlist.cpp3
2 files changed, 6 insertions, 3 deletions
diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index 2b2d0ded..114f4ede 100644
--- a/libmultimc/src/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
@@ -111,7 +111,7 @@ void GameUpdateTask::executeTask()
emit gameUpdateComplete(m_response);
}
-bool GameUpdateTask::downloadFile( const PtrFileToDownload file )
+bool GameUpdateTask::downloadFile( const FileToDownloadPtr file )
{
setSubStatus("Downloading " + file->url().toString());
QNetworkReply *reply = netMgr->get(QNetworkRequest(file->url()));
@@ -231,9 +231,9 @@ void GameUpdateTask::updateDownloadProgress(qint64 current, qint64 total)
setProgress((int)(overallDLProgress * 100));
}
-PtrFileToDownload FileToDownload::Create(const QUrl &url, const QString &path, QObject *parent)
+FileToDownloadPtr FileToDownload::Create(const QUrl &url, const QString &path, QObject *parent)
{
- return PtrFileToDownload(new FileToDownload (url, path, parent));
+ return FileToDownloadPtr(new FileToDownload (url, path, parent));
}
FileToDownload::FileToDownload(const QUrl &url, const QString &path, QObject *parent) :
diff --git a/libmultimc/src/minecraftversionlist.cpp b/libmultimc/src/minecraftversionlist.cpp
index 04c4f918..71deb471 100644
--- a/libmultimc/src/minecraftversionlist.cpp
+++ b/libmultimc/src/minecraftversionlist.cpp
@@ -160,6 +160,9 @@ MCVListLoadTask::MCVListLoadTask(MinecraftVersionList *vlist)
{
m_list = vlist;
m_currentStable = NULL;
+ processedAssetsReply = false;
+ processedMCNReply = false;
+ processedMCVListReply = false;
}
MCVListLoadTask::~MCVListLoadTask()