From 6a45790538f5ce6679a34259320cf91c9fbee641 Mon Sep 17 00:00:00 2001
From: Lonami Exo <totufals@hotmail.com>
Date: Wed, 1 Feb 2017 10:49:39 +0100
Subject: [PATCH] Fix going back on the Customize screen

---
 .../klooni/screens/CustomizeScreen.java        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/core/src/io/github/lonamiwebs/klooni/screens/CustomizeScreen.java b/core/src/io/github/lonamiwebs/klooni/screens/CustomizeScreen.java
index cdc5731..e794922 100644
--- a/core/src/io/github/lonamiwebs/klooni/screens/CustomizeScreen.java
+++ b/core/src/io/github/lonamiwebs/klooni/screens/CustomizeScreen.java
@@ -30,6 +30,8 @@ class CustomizeScreen implements Screen {
     private Klooni game;
     private Stage stage;
 
+    private final Screen lastScreen;
+
     //endregion
 
     //region Static members
@@ -45,6 +47,7 @@ class CustomizeScreen implements Screen {
         final GameLayout layout = new GameLayout();
 
         this.game = game;
+        this.lastScreen = lastScreen;
         stage = new Stage();
 
         Table table = new Table();
@@ -59,8 +62,7 @@ class CustomizeScreen implements Screen {
         backButton.addListener(new ChangeListener() {
             @Override
             public void changed(ChangeEvent event, Actor actor) {
-                CustomizeScreen.this.game.setScreen(lastScreen);
-                dispose();
+                goBack();
             }
         });
         optionsGroup.addActor(backButton);
@@ -127,6 +129,15 @@ class CustomizeScreen implements Screen {
 
     //endregion
 
+    //region Private methods
+
+    private void goBack() {
+        CustomizeScreen.this.game.setScreen(lastScreen);
+        dispose();
+    }
+
+    //endregion
+
     //region Public methods
 
     @Override
@@ -142,8 +153,7 @@ class CustomizeScreen implements Screen {
         stage.draw();
 
         if (Gdx.input.isKeyJustPressed(Input.Keys.BACK)) {
-            game.setScreen(new MainMenuScreen(game));
-            dispose();
+            goBack();
         }
     }