diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-08 23:52:15 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-08 23:52:15 +0100 |
| commit | 583786757a112827ac12efdf6736d1b602e6eb1e (patch) | |
| tree | 962eafca145c321f0e1e23cc52a8fcc52540d67f /logic/lists/InstanceList.h | |
| parent | af33b966848687048f0a9e409444bc1b1f7d12df (diff) | |
| download | MultiMC-583786757a112827ac12efdf6736d1b602e6eb1e.tar MultiMC-583786757a112827ac12efdf6736d1b602e6eb1e.tar.gz MultiMC-583786757a112827ac12efdf6736d1b602e6eb1e.tar.lz MultiMC-583786757a112827ac12efdf6736d1b602e6eb1e.tar.xz MultiMC-583786757a112827ac12efdf6736d1b602e6eb1e.zip | |
Fix crash bug related to messageboxes interrupting model resets in the instance list.
Diffstat (limited to 'logic/lists/InstanceList.h')
| -rw-r--r-- | logic/lists/InstanceList.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/logic/lists/InstanceList.h b/logic/lists/InstanceList.h index cda51a03..ebe3e051 100644 --- a/logic/lists/InstanceList.h +++ b/logic/lists/InstanceList.h @@ -27,11 +27,24 @@ class BaseInstance; class QDir; +struct FTBRecord +{ + QString dirName; + QString name; + QString logo; + QString mcVersion; + QString description; + QString instanceDir; + QString templateDir; +}; + class InstanceList : public QAbstractListModel { Q_OBJECT private: void loadGroupList(QMap<QString, QString> &groupList); + QList<FTBRecord> discoverFTBInstances(); + void loadFTBInstances(QMap<QString, QString> &groupMap, QList<InstancePtr> & tempList); private slots: @@ -109,7 +122,6 @@ slots: * \brief Loads the instance list. Triggers notifications. */ InstListError loadList(); - void loadForgeInstances(QMap<QString, QString> groupMap); private slots: @@ -120,7 +132,7 @@ slots: private: int getInstIndex(BaseInstance *inst) const; - void continueProcessInstance(BaseInstance *instPtr, const int error, const QDir &dir, + bool continueProcessInstance(BaseInstance *instPtr, const int error, const QDir &dir, QMap<QString, QString> &groupMap); protected: |