1
0
Fork 0

Merge branch 'master' into next

This commit is contained in:
Tim Moore 2009-09-18 10:39:48 +02:00
commit 2936c45923

View file

@ -692,6 +692,7 @@ FGGeneric::read_config(SGPropertyNode *root, vector<_serial_prot> &msg)
}
if( binary_mode ) {
if (binary_record_length == -1) {
binary_record_length = record_length;
} else if (binary_record_length < record_length) {
@ -700,4 +701,5 @@ FGGeneric::read_config(SGPropertyNode *root, vector<_serial_prot> &msg)
" requested record representation.");
binary_record_length = record_length;
}
}
}