fix possible scenario that would leave hotkeys disabled unintentionally

This commit is contained in:
Gered 2015-12-01 16:06:25 -05:00
parent 23a413a98a
commit 063e88be02

View file

@ -256,6 +256,8 @@ final class Actions {
boolean betterRun = run.isPersonalBest(); boolean betterRun = run.isPersonalBest();
boolean betterSgt = run.hasSegmentsBest(); boolean betterSgt = run.hasSegmentsBest();
boolean confirmed = false;
if ( betterRun || betterSgt ) { if ( betterRun || betterSgt ) {
String message = betterRun String message = betterRun
? Language.WARN_BETTER_RUN.get() ? Language.WARN_BETTER_RUN.get()
@ -265,17 +267,15 @@ final class Actions {
Language.WARNING.get(), JOptionPane.YES_NO_CANCEL_OPTION, Language.WARNING.get(), JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.WARNING_MESSAGE ); JOptionPane.WARNING_MESSAGE );
if ( option == JOptionPane.CANCEL_OPTION ) { if ( option == JOptionPane.YES_OPTION ) {
master.setIgnoreNativeInputs( false );
return false;
} else if ( option == JOptionPane.YES_OPTION ) {
run.saveLiveTimes( !betterRun ); run.saveLiveTimes( !betterRun );
run.reset(); run.reset();
save(); save();
confirmed = true;
} }
} }
master.setIgnoreNativeInputs( before ); master.setIgnoreNativeInputs( before );
return true; return confirmed;
} }
/** /**