From 95d857e0913ca5b9f17daabe6a8e15ec86d052b2 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Thu, 6 Dec 2007 17:57:41 +0000
Subject: [PATCH] - comparison: don't crash if second element is missing -
 better messages ("panel"?!)

---
 simgear/props/condition.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/simgear/props/condition.cxx b/simgear/props/condition.cxx
index 7dbc27cc..54f5324f 100644
--- a/simgear/props/condition.cxx
+++ b/simgear/props/condition.cxx
@@ -214,7 +214,7 @@ doComparison (const SGPropertyNode * left, const SGPropertyNode *right)
     break;
   }
   }
-  throw sg_exception("Unrecognized node type");
+  throw sg_exception("condition: unrecognized node type in comparison");
   return 0;
 }
 
@@ -299,7 +299,7 @@ readNotCondition( SGPropertyNode *prop_root, const SGPropertyNode *node )
     if (condition != 0)
       return new SGNotCondition(condition);
   }
-  SG_LOG(SG_COCKPIT, SG_ALERT, "Panel: empty 'not' condition");
+  SG_LOG(SG_COCKPIT, SG_ALERT, "empty 'not' condition");
   return 0;
 }
 
@@ -341,8 +341,10 @@ readComparison( SGPropertyNode *prop_root,
   condition->setLeftProperty(prop_root, node->getStringValue("property[0]"));
   if (node->hasValue("property[1]"))
     condition->setRightProperty(prop_root, node->getStringValue("property[1]"));
-  else
+  else if (node->hasValue("value"))
     condition->setRightValue(node->getChild("value", 0));
+  else
+    throw sg_exception("condition: comparison without property[1] or value");
 
   return condition;
 }
-- 
2.39.5