[Simulator] Fix trims issue with AVR simulators (build failure since 57dc015); Fix possible array bounds issue if data is corrupt.

2017-04-07 03:50:40 -04:00
parent 3a8f9adb4d
commit 629d82fe27
2 changed files with 6 additions and 2 deletions
@@ -689,7 +689,7 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen
            swName = QString(generalSettings->switchName[qr.quot]);
          if (swName.isEmpty())
            swName = getSwitchInfo(board, qr.quot).name;
-          return swName + directionIndicators.at(qr.rem < directionIndicators.size() ? qr.rem : 1);
+          return swName + directionIndicators.at(qr.rem > -1 && qr.rem < directionIndicators.size() ? qr.rem : 1);
        }
        else {
          return CHECK_IN_ARRAY(switches9X, index - 1);