summaryrefslogtreecommitdiffstats
path: root/logic/OneSixInstance.h
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-01-27 19:20:07 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-01-27 19:20:07 +0100
commitf9ea3dbfdea0db5626a6afadcfd599a5f53d8abd (patch)
treee02cbc9b4f290a7ea4fe37cd2996f6a8f2595177 /logic/OneSixInstance.h
parent966f9d1206fee51641c9ae844323f85316a59b1d (diff)
downloadMultiMC-f9ea3dbfdea0db5626a6afadcfd599a5f53d8abd.tar
MultiMC-f9ea3dbfdea0db5626a6afadcfd599a5f53d8abd.tar.gz
MultiMC-f9ea3dbfdea0db5626a6afadcfd599a5f53d8abd.tar.lz
MultiMC-f9ea3dbfdea0db5626a6afadcfd599a5f53d8abd.tar.xz
MultiMC-f9ea3dbfdea0db5626a6afadcfd599a5f53d8abd.zip
Split parsing/applying. Better error logging. Fix crash.
Diffstat (limited to 'logic/OneSixInstance.h')
-rw-r--r--logic/OneSixInstance.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h
index 94577828..ee64e886 100644
--- a/logic/OneSixInstance.h
+++ b/logic/OneSixInstance.h
@@ -52,11 +52,13 @@ public:
virtual QDialog *createModEditDialog(QWidget *parent) override;
/// reload the full version json files. return true on success!
- bool reloadFullVersion(QWidget *widgetParent = 0);
+ bool reloadVersion(QWidget *widgetParent = 0);
/// clears all version information in preparation for an update
- void clearFullVersion();
+ void clearVersion();
/// get the current full version info
- std::shared_ptr<OneSixVersion> getFullVersion();
+ std::shared_ptr<OneSixVersion> getFullVersion() const;
+ /// gets the current version info, excluding custom.json
+ std::shared_ptr<OneSixVersion> getNonCustomVersion() const;
/// is the current version original, or custom?
virtual bool versionIsCustom() override;