Fixes #1360
Merge pull request #1381 from opentx/dvogonen/issue_1360_Companion_crash

Fixes #1360