Merge branch 'master' into next
This commit is contained in:
commit
2936c45923
1 changed files with 9 additions and 7 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue