OMG, making class field public to access it.. I am going to turn this…

… codebase in way bigger mess than previous maintainer!
slp · Jan 21, 2013 · 2aab860 · 2aab860
1 parent 517906a
commit 2aab860
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/com/androidemu/EmulatorActivity.java b/src/com/androidemu/EmulatorActivity.java
@@ -104,10 +104,8 @@ protected void onCreate(Bundle savedInstanceState)
 
 		loadGlobalSettings();
 
-
 		loadBIOS(cfg.bios);
 
-		cfg.setHandler(this);
 		/*
 		if (savedInstanceState != null)
 		{
@@ -134,17 +132,16 @@ && loadROM(last, false))
 	@Override
 	protected boolean isMenuAccessible()
 	{
-		return cfg.hintShown_fullScreen ||
-				(Wrapper.isHwMenuBtnAvailable(this)
-				? cfg.keysMap[KeyEvent.KEYCODE_MENU] == 0 :
-					!cfg.fullScreen);
+		return cfg.hintShown_fullScreen || (Wrapper.isHwMenuBtnAvailable(this)
+				? keyboard.keysMap[KeyEvent.KEYCODE_MENU] == 0 : !cfg.fullScreen);
 	}
 
 	protected void initResources()
 	{
 		super.initResources();
 
 		cfg = new UserPrefs(getApplicationContext());
+		cfg.setHandler(this);
 	}
 
 	@Override

diff --git a/src/com/androidemu/gba/input/Keyboard.java b/src/com/androidemu/gba/input/Keyboard.java
@@ -8,7 +8,7 @@ public class Keyboard implements View.OnKeyListener {
 
 	private GameKeyListener gameKeyListener;
 	private View.OnKeyListener keyListener;
-	private int[] keysMap = new int[128];
+	public int[] keysMap = new int[128];
 	private int keyStates;
 
 	public Keyboard(View view, GameKeyListener listener) {