Skip to content

Commit

Permalink
don't autoactive timer unless already running
Browse files Browse the repository at this point in the history
  • Loading branch information
n8fr8 committed Dec 21, 2017
1 parent 0fd6f69 commit b5868a1
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/main/java/org/havenapp/main/MonitorActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,19 @@ private void doCancel ()
private void showSettings ()
{

Intent i = new Intent(this,SettingsActivity.class);

if (cTimer != null) {
cTimer.cancel();
cTimer = null;
startActivityForResult(i,9999);

}
else
{
startActivity(i);
}

Intent i = new Intent(this,SettingsActivity.class);
startActivityForResult(i,9999);
}

@Override
Expand Down

0 comments on commit b5868a1

Please sign in to comment.