allow to trigger widgets via accelerator key, which is defined via "keynum"

[flightgear.git] / src / Input / input.cxx

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 76c9a2d1958c1e8a9e6795a4ff2adbf23efa39b4..14aaf5a4fac829303a7a97da6d2a3b7fc2e16808 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -95,7 +95,7 @@ FGBinding::FGBinding (const SGPropertyNode * node)
 
 FGBinding::~FGBinding ()
 {
-  _arg->getParent()->removeChild(_arg->getName(), _arg->getIndex());
+  _arg->getParent()->removeChild(_arg->getName(), _arg->getIndex(), false);
 }
 
 void
@@ -484,6 +484,9 @@ FGInput::_init_joystick ()
       js_node->setStringValue("id", name);
     }
   }
+
+  // get rid of unused config nodes
+  js_nodes->removeChildren("js-named", false);
 }
 
 
@@ -492,7 +495,6 @@ FGInput::_postinit_joystick()
 {
   FGNasalSys *nasalsys = (FGNasalSys *)globals->get_subsystem("nasal");
   SGPropertyNode *js_nodes = fgGetNode("/input/joysticks");
-  js_nodes->removeChildren("js-named");
 
   for (int i = 0; i < MAX_JOYSTICKS; i++) {
     SGPropertyNode_ptr js_node = js_nodes->getChild("js", i);