Skip to content

Commit

Permalink
Fix tiny logical conflict due to another PR (and a stray code style i…
Browse files Browse the repository at this point in the history
…ssue)
  • Loading branch information
Cervator committed Jul 25, 2018
1 parent e2119bc commit c115c14
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions engine/src/main/java/org/destinationsol/game/Console.java
Expand Up @@ -168,7 +168,7 @@ public void setInputHandler(ConsoleInputHandler inputHandler) {
@Override
public void updateCustom(SolApplication solApplication, SolInputManager.InputPointer[] inputPointers, boolean clickedOutside) {
if (exitControl.isJustOff()) {
solApplication.getInputManager().setScreen(solApplication, solApplication.getGame().getScreens().mainScreen);
solApplication.getInputManager().setScreen(solApplication, solApplication.getGame().getScreens().mainGameScreen);
}
}

Expand Down Expand Up @@ -301,8 +301,7 @@ private void drawInputLine(UiDrawer uiDrawer, float textX) {
break;
}
stringBuilder.append(c);
}
else {
} else {
inputLine.deleteCharAt(0);
}
}
Expand Down

0 comments on commit c115c14

Please sign in to comment.