From 31e219258e829280d48fd2061bf2764d4fbab1b4 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Tue, 5 May 2015 16:34:51 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BB=D0=B5=D0=B4=D1=83=D1=8E=D1=89?=
 =?UTF-8?q?=D0=B5=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BE=D0=B1=D1=8B=D1=87=D0=BD=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D1=83=D0=B7=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/annimon/everlastingsummer/ViewActivity.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/com/annimon/everlastingsummer/ViewActivity.java b/src/com/annimon/everlastingsummer/ViewActivity.java
index 89470e2..bb3c120 100644
--- a/src/com/annimon/everlastingsummer/ViewActivity.java
+++ b/src/com/annimon/everlastingsummer/ViewActivity.java
@@ -67,7 +67,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
     private Map<String, AnimatableImageView> spriteInContainer;
     private DisplayMetrics displayMetrics;
     
-    private boolean blockTap;
+    private transient boolean blockTap, cancelNextStep;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -182,7 +182,10 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
     public void onTouchGesture(TouchGestureType type) {
         switch (type) {
             case SINGLE_TAP:
-                if (!blockTap) Parser.getInstance().next();
+                if (blockTap) return;
+                
+                cancelNextStep = true;
+                Parser.getInstance().next();
                 break;
             case SWIPE:
                 Dialogs.with(this).showMenu(R.array.menu_items, menu);
@@ -401,6 +404,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
     
     public void pause(final long duration, final boolean hard) {
         blockTap = hard;
+        cancelNextStep = false;
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -630,7 +634,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
         @Override
         public void run() {
             blockTap = false;
-            Parser.getInstance().next();
+            if (!cancelNextStep) Parser.getInstance().next();
         }
     };