Merge with latest 2.3

2020-01-08 16:35:30 +01:00
parent 3d6298b72e 22dacf7f85
commit 0626b31dfe
91 changed files with 1139 additions and 860 deletions
@@ -364,7 +364,7 @@ void OpenTxSim::updateKeysAndSwitches(bool start)
  static FXuint trimKeys[] = { KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12 };
 #endif

-  for (unsigned i=0; i<2*NUM_TRIMS; i++) {
+  for (unsigned i=0; i<NUM_TRIMS_KEYS; i++) {
    simuSetTrim(i, getApp()->getKeyState(trimKeys[i]));
  }