#80 Main menu back button closing behaviour fix

core/src/cz/nic/tablexia/Tablexia.java

@@ -23,7 +23,9 @@ import cz.nic.tablexia.loader.application.ApplicationFontManager;
 import cz.nic.tablexia.loader.application.ApplicationInternalSoundManager;
 import cz.nic.tablexia.loader.application.ApplicationTextManager;
 import cz.nic.tablexia.loader.zip.ZipAssetLoader;
+import cz.nic.tablexia.menu.AbstractMenu;
 import cz.nic.tablexia.menu.MenuController;
+import cz.nic.tablexia.menu.main.MainMenu;
 import cz.nic.tablexia.screen.AbstractTablexiaScreen;
 import cz.nic.tablexia.screen.loader.IConnectionManager;
 import cz.nic.tablexia.util.Log;
@@ -110,16 +112,6 @@ public class Tablexia extends TablexiaApplication {
         addMenuController(menuController);
     }
 
-	@Override
-	public boolean onBackButtonDown() {
-		if(menuController != null && menuController.isMenuOpened()) {
-			menuController.closeAllMenus();
-			return false;
-		}
-
-		return true;
-	}
-
 	@Override
     public void resize(int width, int height) {
         super.resize(width, height);
@@ -167,6 +159,19 @@ public class Tablexia extends TablexiaApplication {
     }
 
 
+//////////////////////////// BACK BUTTON HANDLER
+
+    @Override
+    public boolean onBackButtonDown() {
+        if(menuController != null && !menuController.isMenuClosed(MainMenu.class) && !menuController.isMenuHidden(MainMenu.class)) {
+            menuController.doMenuAction(MainMenu.class, AbstractMenu.MenuAction.CLOSE, true, false);
+            return false;
+        }
+
+        return true;
+    }
+
+
 //////////////////////////// APPLICATION FLOW HANDLERS
 
     @Handler

core/src/cz/nic/tablexia/menu/MenuController.java

@@ -68,19 +68,13 @@ public class MenuController extends Group implements Disposable {
         initMenu(UserMenu.class);
     }
 
-	public boolean isMenuOpened() {
-		for(AbstractMenu menu : menus.values()) {
-			if(menu.isMenuOpen()) return true;
-		}
-
-		return false;
-	}
-
-	public void closeAllMenus() {
-		for(AbstractMenu menu : menus.values()) {
-			menu.closeMenu(true, false);
-		}
-	}
+    public boolean isMenuClosed(final Class<? extends AbstractMenu> menuClass) {
+        return menus.get(menuClass).isMenuClose();
+    }
+
+    public boolean isMenuHidden(final Class<? extends AbstractMenu> menuClass) {
+        return menus.get(menuClass).isMenuHidden();
+    }
 
     public void initMenu (Class<? extends AbstractMenu> menuClass) {
         try {