Fix timer not cancelling on game load

2 files changed, 6 insertions, 0 deletions

diff --git a/src/esieequest/view/app/UserInterface.java b/src/esieequest/view/app/UserInterface.java
index b00673c..6e2cb08 100644
--- a/src/esieequest/view/app/UserInterface.java
+++ b/src/esieequest/view/app/UserInterface.java
@@ -641,6 +641,8 @@ abstract class UserInterface implements Viewable, ActionListener {
 
         @Override
         public void playScene(final Scene scene) {
+                this.skipScene();
+
                 this.disableInput();
 
                 this.setQuestLabel(scene.getTitle());
@@ -687,6 +689,7 @@ abstract class UserInterface implements Viewable, ActionListener {
                 } catch (final IOException e) {
                         e.printStackTrace();
                 }
+                this.skipScene();
                 return serialisedGame;
         }
 
diff --git a/src/esieequest/view/web/WebInterface.java b/src/esieequest/view/web/WebInterface.java
index e749c1f..82264fa 100644
--- a/src/esieequest/view/web/WebInterface.java
+++ b/src/esieequest/view/web/WebInterface.java
@@ -436,6 +436,8 @@ class WebInterface extends Composite implements Viewable {
 
         @Override
         public void playScene(final Scene scene) {
+                this.skipScene();
+
                 this.disableInput();
 
                 this.setQuestLabel(scene.getTitle());
@@ -470,6 +472,7 @@ class WebInterface extends Composite implements Viewable {
                 if (this.storage == null) {
                         return null;
                 }
+                this.skipScene();
                 return this.storage.getItem(path);
         }