2 files changed, 12 insertions, 1 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index c4bb84e4..9268a8ae 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -321,7 +321,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
     {
         // Root path is used for updates and portable data
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
         QDir foo(FS::PathCombine(binPath, "..")); // typically portable-root or /usr
         m_rootPath = foo.absolutePath();
 #elif defined(Q_OS_WIN32)
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index a2e055ba..9b70e7a1 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -83,6 +83,17 @@ void ModFolderLoadTask::run()
         }
     }
 
+    // Remove orphan metadata to prevent issues
+    // See https://github.com/PolyMC/PolyMC/issues/996
+    QMutableMapIterator<QString, Mod::Ptr> iter(m_result->mods);
+    while (iter.hasNext()) {
+        auto mod = iter.next().value();
+        if (mod->status() == ModStatus::NotInstalled) {
+            mod->destroy(m_index_dir, false);
+            iter.remove();
+        }
+    }
+
     emit succeeded();
 }