From: James Turner <zakalawe@mac.com>
Date: Wed, 2 Oct 2013 21:08:17 +0000 (+0100)
Subject: Fix a crash with GPS dialog.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b2759d018b633ec9f0ca6f9e79d9e21ac24d0eba;p=flightgear.git

Fix a crash with GPS dialog.

If an invalid filter type is supplied, don't run the queries.
This showed up with GPS dialog, since the PUI combo box defaults to
no entry selected, not the first entry.
---

diff --git a/src/Scripting/NasalPositioned_cppbind.cxx b/src/Scripting/NasalPositioned_cppbind.cxx
index d0fe0b942..eb9a14158 100644
--- a/src/Scripting/NasalPositioned_cppbind.cxx
+++ b/src/Scripting/NasalPositioned_cppbind.cxx
@@ -395,9 +395,13 @@ static naRef f_findWithinRange(nasal::CallContext ctx)
 {
   SGGeod pos = getPosition(ctx);
   double range_nm = ctx.requireArg<double>(0);
-
-  FGPositioned::TypeFilter filter(FGPositioned::typeFromName(ctx.getArg<std::string>(1)));
+  
+    FGPositioned::Type ty = FGPositioned::typeFromName(ctx.getArg<std::string>(1));
+    if (ty == FGPositioned::INVALID)
+        naRuntimeError(ctx.c, "invalid filter type specification");
     
+  FGPositioned::TypeFilter filter(ty);
+  
   FGPositionedList items = FGPositioned::findWithinRange(pos, range_nm, &filter);
   FGPositioned::sortByRange(items, pos);
   return ctx.to_nasal(items);