aboutsummaryrefslogtreecommitdiff
path: root/api/logic/InstanceImportTask.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-02-09 05:04:23 +0100
committerPetr Mrázek <peterix@gmail.com>2021-02-09 05:04:23 +0100
commit13a7f8d3b7b7d92387099141fad81ca74adedf1d (patch)
tree5d8b11759a521c1ca9e348732b1fb62e9c18d999 /api/logic/InstanceImportTask.h
parent434369ca7cc8e56181d75474ac099eba76f407dc (diff)
downloadPrismLauncher-13a7f8d3b7b7d92387099141fad81ca74adedf1d.tar.gz
PrismLauncher-13a7f8d3b7b7d92387099141fad81ca74adedf1d.tar.bz2
PrismLauncher-13a7f8d3b7b7d92387099141fad81ca74adedf1d.zip
NOISSUE fix multiple issues in ATLauncher integration
Diffstat (limited to 'api/logic/InstanceImportTask.h')
-rw-r--r--api/logic/InstanceImportTask.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/api/logic/InstanceImportTask.h b/api/logic/InstanceImportTask.h
index db658808..7291324d 100644
--- a/api/logic/InstanceImportTask.h
+++ b/api/logic/InstanceImportTask.h
@@ -24,6 +24,8 @@
#include "settings/SettingsObject.h"
#include "QObjectPtr.h"
+#include <nonstd/optional>
+
class QuaZip;
namespace Flame
{
@@ -60,8 +62,8 @@ private: /* data */
QString m_archivePath;
bool m_downloadRequired = false;
std::unique_ptr<QuaZip> m_packZip;
- QFuture<QStringList> m_extractFuture;
- QFutureWatcher<QStringList> m_extractFutureWatcher;
+ QFuture<nonstd::optional<QStringList>> m_extractFuture;
+ QFutureWatcher<nonstd::optional<QStringList>> m_extractFutureWatcher;
enum class ModpackType{
Unknown,
MultiMC,