Skip to content

Commit

Permalink
Use the reticule key enable state again.
Browse files Browse the repository at this point in the history
Keys F1-F6 to open reticule menus were broken with commit 2810c73.
Fixes ticket:4715.
  • Loading branch information
KJeff01 committed Feb 3, 2018
1 parent 64b57db commit 9476a9a
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/hci.cpp
Expand Up @@ -394,6 +394,7 @@ void setReticuleStats(int ButId, QString tip, QString filename, QString filename
retbutstats[ButId].flashTime = 0;
retbutstats[ButId].func = func;
retbutstats[ButId].engine = engine;
ReticuleEnabled[ButId].Enabled = false;

if (!retbutstats[ButId].button) // not quite set up yet
{
Expand All @@ -411,6 +412,7 @@ void setReticuleStats(int ButId, QString tip, QString filename, QString filename
}
else
{
ReticuleEnabled[ButId].Enabled = true;
retbutstats[ButId].button->setState(0);
}
}
Expand Down Expand Up @@ -4419,6 +4421,10 @@ switch (buttonID)
reticuleCallback(RETBUT_DESIGN);
triggerEvent(TRIGGER_MENU_DESIGN_UP);
break;
case RETBUT_INTELMAP:
addIntelScreen();
reticuleCallback(RETBUT_INTELMAP);
break;
case RETBUT_COMMAND:
intResetScreen(false);
widgSetButtonState(psWScreen, IDRET_COMMAND, WBUT_CLICKLOCK);
Expand Down

0 comments on commit 9476a9a

Please sign in to comment.