fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Torsten Dreyer 2010-05-24 12:01:30 +02:00
commit 386aefe693
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Main/options.cxx
View file

@ -530,6 +530,14 @@ parse_fov( const string& arg ) {
static bool
add_channel( const string& type, const string& channel_str ) {
// This check is neccessary to prevent fgviewer from segfaulting when given
// weird options. (It doesn't run the full initailization)
if(!globals->get_channel_options_list())
{
SG_LOG(SG_GENERAL, SG_ALERT, "Option " << type << "=" << channel_str
<< " ignored.");
return false;
}
SG_LOG(SG_GENERAL, SG_INFO, "Channel string = " << channel_str );
globals->get_channel_options_list()->push_back( type + "," + channel_str );
return true;
@ -1572,6 +1580,7 @@ parse_option (const string& arg)
}
break;
case OPTION_CHANNEL:
// XXX return value of add_channel should be checked?
if ( pt->has_param && !arg_value.empty() ) {
add_channel( pt->option, arg_value );
} else if ( !pt->has_param && arg_value.empty() ) {