From 9fcb9206f98fe973dd27852bc3c981f4d70840ea Mon Sep 17 00:00:00 2001
From: James Turner <james@flightgear.org>
Date: Sat, 12 Aug 2023 13:08:20 +0100
Subject: [PATCH] Improve errors around 2D panels

---
 src/Cockpit/panel_io.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index 1c7d74bd0..dd2021014 100644
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -641,6 +641,7 @@ readPanel (const SGPropertyNode * root, const SGPath& path)
 {
   SG_LOG( SG_COCKPIT, SG_INFO, "Reading properties for panel " <<
           root->getStringValue("name", "[Unnamed Panel]") );
+  simgear::ErrorReportContext ec("2d-panel", path.utf8Str());
 
   FGPanel * panel = new FGPanel();
   panel->setWidth(root->getIntValue("w", 1024));
@@ -775,7 +776,8 @@ readPanel (const SGPropertyNode * root, const SGPath& path)
 		  FGSpecialInstrument* gpsinst = new FGSpecialInstrument(gps);
           panel->addInstrument(gpsinst);
         } else {
-          SG_LOG( SG_COCKPIT, SG_WARN, "Unknown special instrument found" );
+          simgear::reportFailure(simgear::LoadFailure::Misconfigured, simgear::ErrorCode::AircraftSystems,
+             "Unknown special instrument found:" + name, path);
         }
       } else {
         SG_LOG( SG_COCKPIT, SG_WARN, "Skipping " << node->getNameString()
@@ -828,6 +830,8 @@ fgReadPanel (istream &input)
 FGPanel *
 fgReadPanel (const string &relative_path)
 {
+  simgear::ErrorReportContext ec("2d-panel", relative_path);
+
   SGPath path = globals->resolve_aircraft_path(relative_path);
   SGPropertyNode root;