fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Tim Moore 2009-09-18 10:39:48 +02:00
commit 2936c45923
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Network/generic.cxx
View file

@ -692,12 +692,14 @@ FGGeneric::read_config(SGPropertyNode *root, vector<_serial_prot> &msg)
}
if (binary_record_length == -1) {
binary_record_length = record_length;
} else if (binary_record_length < record_length) {
SG_LOG(SG_IO, SG_ALERT,
"generic protocol: Requested binary record length shorter than "
" requested record representation.");
binary_record_length = record_length;
if( binary_mode ) {
if (binary_record_length == -1) {
binary_record_length = record_length;
} else if (binary_record_length < record_length) {
SG_LOG(SG_IO, SG_ALERT,
"generic protocol: Requested binary record length shorter than "
" requested record representation.");
binary_record_length = record_length;
}
}
}