From: ThorstenB Date: Thu, 20 Jan 2011 00:06:46 +0000 (+0100) Subject: Another place to catch SG exceptions. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=02b3c37b9fa8cbf591aca8c817cf79593002fe34;p=simgear.git Another place to catch SG exceptions. SGBinding::fire needs to catch, otherwise exceptions in the event handler context cause an FG exit (fixes a crash with the route manager dialog). --- diff --git a/simgear/structure/SGBinding.cxx b/simgear/structure/SGBinding.cxx index 9e5fce06..836d7abc 100644 --- a/simgear/structure/SGBinding.cxx +++ b/simgear/structure/SGBinding.cxx @@ -16,6 +16,8 @@ #include +#include + SGBinding::SGBinding() : _command(0), _arg(new SGPropertyNode), @@ -62,9 +64,17 @@ SGBinding::fire () const _command = SGCommandMgr::instance()->getCommand(_command_name); if (_command == 0) { SG_LOG(SG_INPUT, SG_WARN, "No command attached to binding"); - } else if (!(*_command)(_arg)) { - SG_LOG(SG_INPUT, SG_ALERT, "Failed to execute command " - << _command_name); + } else + { + try { + if (!(*_command)(_arg)) { + SG_LOG(SG_INPUT, SG_ALERT, "Failed to execute command " + << _command_name); + } + } catch (sg_exception& e) { + SG_LOG(SG_GENERAL, SG_ALERT, "command '" << _command_name << "' failed with exception\n" + << "\tmessage:" << e.getMessage() << " (from " << e.getOrigin() << ")"); + } } } }