From 0bc5df9e8de6a36272af20e48ff4d73f9324278c Mon Sep 17 00:00:00 2001
From: Haakon Gunleiksrud <haakogun@stud.ntnu.no>
Date: Fri, 27 Mar 2020 18:53:42 +0100
Subject: [PATCH] #59 Fixed the music checkbox such that is follows the
 GameWare field musicOn.

---
 .../core/src/com/gameware/game/states/OptionsState.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/core/src/com/gameware/game/states/OptionsState.java b/frontend/core/src/com/gameware/game/states/OptionsState.java
index 468a2cb..ad60dda 100644
--- a/frontend/core/src/com/gameware/game/states/OptionsState.java
+++ b/frontend/core/src/com/gameware/game/states/OptionsState.java
@@ -107,12 +107,14 @@ public class OptionsState extends State {
 
     private CheckBox makeMusicCheckBox(Skin skin){
         CheckBox musicToggle = new CheckBox("",skin);
+        musicToggle.getImage().setScale(2,2);
+        if((GameWare.getInstance().getMusicOn() && !musicToggle.isChecked()) || (!GameWare.getInstance().getMusicOn() && musicToggle.isChecked())){
+            musicToggle.toggle();
+        }
         musicToggle.addListener(new ClickListener() {
             @Override
             public void clicked(InputEvent e, float x, float y){ GameWare.getInstance().toggleMusic(); }
         });
-        musicToggle.getImage().setScale(2,2);
-        musicToggle.toggle();
         return musicToggle;
     }
 
-- 
GitLab