Fix possible negative time setting when time is up.

Change-Id: Ic519480dd85075b0122d8ef8fcb32c1a68542ae3

1 files changed, 9 insertions, 6 deletions

diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
index 4cde89d1ece2..791861cfaab5 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
@@ -325,16 +325,19 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     }
 
     private void callEditingTimer(Timer aTimer) {
-        int aTimerLength = aTimer.getMinutesLeft();
-
-        DialogFragment aFragment = TimerEditingDialog.newInstance(aTimerLength);
+        DialogFragment aFragment = buildTimerEditingDialog(aTimer);
         aFragment.show(getSupportFragmentManager(), TimerEditingDialog.TAG);
 
-        pauseTimer();
+        aTimer.pause();
     }
 
-    private void pauseTimer() {
-        mCommunicationService.getSlideShow().getTimer().pause();
+    private DialogFragment buildTimerEditingDialog(Timer aTimer) {
+        if (aTimer.isTimeUp()) {
+            return TimerEditingDialog.newInstance(aTimer.getMinutesLength());
+        }
+        else {
+            return TimerEditingDialog.newInstance(aTimer.getMinutesLeft());
+        }
     }
 
     private void callSettingTimer() {