From 8e198f3616d2b6e0b0b423e68520c9f0382ba78c Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Sun, 3 May 2015 14:33:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BD=D0=BE=D0=B5=20=D0=B2=D0=BE=D1=81=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=B8=D1=86=D0=B8=D0=B8=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D1=81=D0=BE?=
 =?UTF-8?q?=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/annimon/everlastingsummer/Parser.java       | 8 +++++++-
 src/com/annimon/everlastingsummer/ViewActivity.java | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/com/annimon/everlastingsummer/Parser.java b/src/com/annimon/everlastingsummer/Parser.java
index 7952637..a92775c 100644
--- a/src/com/annimon/everlastingsummer/Parser.java
+++ b/src/com/annimon/everlastingsummer/Parser.java
@@ -35,7 +35,7 @@ public final class Parser {
     
     private final List<Token> tokens;
     private final int tokensCount;
-    private int position;
+    private int position, lastPosition;
     
     private final Map<String, Integer> labels;
     /** Оптимизация, чтобы каждый раз не искать endmenu/endif,
@@ -55,6 +55,7 @@ public final class Parser {
         this.tokens = tokens;
         tokensCount = tokens.size();
         this.position = position;
+        lastPosition = position;
         labels = new HashMap<String, Integer>();
         hasEndMenu = false;
         hasEndIf = false;
@@ -69,6 +70,10 @@ public final class Parser {
     public int getTokensCount() {
         return tokensCount;
     }
+    
+    public int getLastPosition() {
+        return lastPosition;
+    }
 
     public int getPosition() {
         return position;
@@ -86,6 +91,7 @@ public final class Parser {
     }
 
     public void next() {
+        lastPosition = position;
         // Команды разделяются на терминальные и нетерминальные.
         // Нетерминальные подготавливают сцену к выводу.
         // Терминальные выводят всё на экран и ожидают следующего вызова.
diff --git a/src/com/annimon/everlastingsummer/ViewActivity.java b/src/com/annimon/everlastingsummer/ViewActivity.java
index 17bebea..241def0 100644
--- a/src/com/annimon/everlastingsummer/ViewActivity.java
+++ b/src/com/annimon/everlastingsummer/ViewActivity.java
@@ -477,7 +477,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
         final long timestamp = System.currentTimeMillis();
         final SaveInfo info = new SaveInfo();
         info.setPath(scriptPath);
-        info.setPosition(Parser.getInstance().getPosition());
+        info.setPosition(Parser.getInstance().getLastPosition());
         info.setTime(timestamp);
         info.setVariables(Variables.getVariables());
         try {