Merge branch 'PrismLauncher:develop' into mrpack-export

2 files changed, 15 insertions, 1 deletions

diff --git a/launcher/minecraft/launch/ScanModFolders.cpp b/launcher/minecraft/launch/ScanModFolders.cpp
index bdffeadd..71e7638c 100644
--- a/launcher/minecraft/launch/ScanModFolders.cpp
+++ b/launcher/minecraft/launch/ScanModFolders.cpp
@@ -55,6 +55,12 @@ void ScanModFolders::executeTask()
     if(!cores->update()) {
         m_coreModsDone = true;
     }
+
+    auto nils = m_inst->nilModList();
+    connect(nils.get(), &ModFolderModel::updateFinished, this, &ScanModFolders::nilModsDone);
+    if(!nils->update()) {
+        m_nilModsDone = true;
+    }
     checkDone();
 }
 
@@ -70,9 +76,15 @@ void ScanModFolders::coreModsDone()
     checkDone();
 }
 
+void ScanModFolders::nilModsDone()
+{
+    m_nilModsDone = true;
+    checkDone();
+}
+
 void ScanModFolders::checkDone()
 {
-    if(m_modsDone && m_coreModsDone) {
+    if(m_modsDone && m_coreModsDone && m_nilModsDone) {
         emitSucceeded();
     }
 }
diff --git a/launcher/minecraft/launch/ScanModFolders.h b/launcher/minecraft/launch/ScanModFolders.h
index d5989170..111a5850 100644
--- a/launcher/minecraft/launch/ScanModFolders.h
+++ b/launcher/minecraft/launch/ScanModFolders.h
@@ -33,10 +33,12 @@ public:
 private slots:
     void coreModsDone();
     void modsDone();
+    void nilModsDone();
 private:
     void checkDone();
 
 private: // DATA
     bool m_modsDone = false;
+    bool m_nilModsDone = false;
     bool m_coreModsDone = false;
 };