CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/images-for-resource-page

Browse Source
This commit is contained in:
Rachel Powers
2023-05-28 12:01:49 -07:00
parent 086a7e19f0 954d4d701a
commit b28f682ad9
120 changed files with 1978 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/minecraft/mod/ResourceFolderModel.h
View File

@ -29,7 +29,7 @@ class QSortFilterProxyModel;
class ResourceFolderModel : public QAbstractListModel {
Q_OBJECT
public:
ResourceFolderModel(QDir, std::shared_ptr<const BaseInstance>, QObject* parent = nullptr, bool create_dir = true);
ResourceFolderModel(QDir, BaseInstance* instance, QObject* parent = nullptr, bool create_dir = true);
~ResourceFolderModel() override;
virtual QString id() const { return "resource"; }
@ -203,7 +203,7 @@ class ResourceFolderModel : public QAbstractListModel {
bool m_can_interact = true;
QDir m_dir;
std::shared_ptr<const BaseInstance> m_instance;
BaseInstance* m_instance;
QFileSystemWatcher m_watcher;
bool m_is_watching = false;