From 5b1138936d7d50875cf39be77b1e8e83f55135bd Mon Sep 17 00:00:00 2001
From: Remco <Remco.boys@gmail.com>
Date: Fri, 19 Jun 2015 11:58:31 +0200
Subject: [PATCH] bug fix, getcolor is null

---
 control/GameStateManager.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/control/GameStateManager.java b/control/GameStateManager.java
index dd251f5..ed75118 100644
--- a/control/GameStateManager.java
+++ b/control/GameStateManager.java
@@ -24,6 +24,7 @@ public class GameStateManager {
 	private int index = 0;
 	public int fps;
 	private float timeOfNoAction = 0,maxTimeToHaveNoAction = 45000;
+	private SongHandler sh;
 	
 	public enum State {
 		TITLE_STATE,
@@ -33,6 +34,7 @@ public class GameStateManager {
 	}
 	
 	public GameStateManager(SongHandler sh, SQLConnector sql){
+		this.sh = sh;
 		gamestates = new ArrayList<GameState>();
 		gamestates.add(new TitleState(this, sh, sql));
 		gamestates.add(new MenuState(this, sh, sql));
@@ -48,6 +50,9 @@ public class GameStateManager {
 		currentState = gamestates.get(st.ordinal());
 
 		init();
+//		System.out.println("Current song: "+sh.getCurrentSongInstance());		
+//		sh.set(sh.getCurrentSongInstance());
+//		sh.play();
 	}
 
 	public void next() {