aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2014-05-24 21:37:12 +0200
committerPacien TRAN-GIRARD2014-05-24 21:37:12 +0200
commit8df4f53c72d6f011862ac7eab51538ad81f55b86 (patch)
tree5ed20269ebf4b404c713f04133e01b13173f936c /src
parentd06c60a6ccc4d97df62b19e91f18d4aa292d9c57 (diff)
downloadesieequest-8df4f53c72d6f011862ac7eab51538ad81f55b86.tar.gz
Fix timer not cancelling on game load
Diffstat (limited to 'src')
-rw-r--r--src/esieequest/view/app/UserInterface.java3
-rw-r--r--src/esieequest/view/web/WebInterface.java3
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 {
641 641
642 @Override 642 @Override
643 public void playScene(final Scene scene) { 643 public void playScene(final Scene scene) {
644 this.skipScene();
645
644 this.disableInput(); 646 this.disableInput();
645 647
646 this.setQuestLabel(scene.getTitle()); 648 this.setQuestLabel(scene.getTitle());
@@ -687,6 +689,7 @@ abstract class UserInterface implements Viewable, ActionListener {
687 } catch (final IOException e) { 689 } catch (final IOException e) {
688 e.printStackTrace(); 690 e.printStackTrace();
689 } 691 }
692 this.skipScene();
690 return serialisedGame; 693 return serialisedGame;
691 } 694 }
692 695
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 {
436 436
437 @Override 437 @Override
438 public void playScene(final Scene scene) { 438 public void playScene(final Scene scene) {
439 this.skipScene();
440
439 this.disableInput(); 441 this.disableInput();
440 442
441 this.setQuestLabel(scene.getTitle()); 443 this.setQuestLabel(scene.getTitle());
@@ -470,6 +472,7 @@ class WebInterface extends Composite implements Viewable {
470 if (this.storage == null) { 472 if (this.storage == null) {
471 return null; 473 return null;
472 } 474 }
475 this.skipScene();
473 return this.storage.getItem(path); 476 return this.storage.getItem(path);
474 } 477 }
475 478