summaryrefslogtreecommitdiffstats
path: root/api/logic/modplatform/FtbPackDownloader.cpp
diff options
context:
space:
mode:
authorJanrupf <werbung.janrupf@t-online.de>2018-03-03 21:22:00 +0100
committerJanrupf <werbung.janrupf@t-online.de>2018-03-11 19:30:47 +0100
commitb8ca36372be11b9ddddb3daa3d32583d286f19e2 (patch)
treeb359357881d14e0b0871b3e5d0175234eb562b72 /api/logic/modplatform/FtbPackDownloader.cpp
parent2d295d5afbf6cb5ce1ca624c4aef8fd96b78992b (diff)
downloadMultiMC-b8ca36372be11b9ddddb3daa3d32583d286f19e2.tar
MultiMC-b8ca36372be11b9ddddb3daa3d32583d286f19e2.tar.gz
MultiMC-b8ca36372be11b9ddddb3daa3d32583d286f19e2.tar.lz
MultiMC-b8ca36372be11b9ddddb3daa3d32583d286f19e2.tar.xz
MultiMC-b8ca36372be11b9ddddb3daa3d32583d286f19e2.zip
GH-2124 First complete implementation, installing is working now! GH-2172 Added sorting
Diffstat (limited to 'api/logic/modplatform/FtbPackDownloader.cpp')
-rw-r--r--api/logic/modplatform/FtbPackDownloader.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/api/logic/modplatform/FtbPackDownloader.cpp b/api/logic/modplatform/FtbPackDownloader.cpp
index a3951bfd..caadd4ae 100644
--- a/api/logic/modplatform/FtbPackDownloader.cpp
+++ b/api/logic/modplatform/FtbPackDownloader.cpp
@@ -9,8 +9,6 @@ FtbPackDownloader::FtbPackDownloader() {
}
FtbPackDownloader::~FtbPackDownloader(){
- delete netJobContainer.get();
- netJobContainer.reset(nullptr);
}
bool FtbPackDownloader::isValidPackSelected(){
@@ -22,7 +20,7 @@ bool FtbPackDownloader::isValidPackSelected(){
return false;
}
- return other.oldVersions.contains(selectedVersion);
+ return other.oldVersions.contains(selectedVersion) && !other.broken;
}
QString FtbPackDownloader::getSuggestedInstanceName() {
@@ -104,3 +102,8 @@ void FtbPackDownloader::_downloadFailed(QString reason) {
netJobContainer.reset();
emit downloadFailed(reason);
}
+
+NetJobPtr FtbPackDownloader::getNetJob()
+{
+ return netJobContainer;
+}