From bdcb30d785b46f56d668f0fcd469dcac947746a5 Mon Sep 17 00:00:00 2001
From: James Turner <james@flightgear.org>
Date: Mon, 14 Jun 2021 10:49:04 +0100
Subject: [PATCH] Launcher: pass catalog paths via fg-aircraft

This should enable hangar aircraft to be found when searching for MP
models
---
 src/GUI/AddOnsController.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/GUI/AddOnsController.cxx b/src/GUI/AddOnsController.cxx
index f334a4f15..d3ae0cc90 100644
--- a/src/GUI/AddOnsController.cxx
+++ b/src/GUI/AddOnsController.cxx
@@ -378,6 +378,12 @@ void AddOnsController::collectArgs()
         m_config->setArg("fg-aircraft", path);
     }
 
+    // add hangars as aircraft paths, so they are available for MP model searching
+    for (const auto& catRef : globals->packageRoot()->catalogs()) {
+        const auto catPath = catRef->installRoot().utf8Str();
+        m_config->setArg("fg-aircraft", QString::fromStdString(catPath));
+    }
+
     // add-on module paths
     // we could query this directly from AddonsModel, but this is simpler right now
     QSettings settings;