From ff3bdcc6762c0bfc02292736d1787deeeeab52ab Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 13 Jun 2015 18:11:54 +0000
Subject: [PATCH] Fix issues with updating mobile player as connecting player

---
 .../src/forge/screens/constructed/LobbyScreen.java | 14 +++++++++-----
 .../src/forge/screens/constructed/PlayerPanel.java |  3 +--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
index d8f6bfc7058..e4eb39c6532 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
@@ -39,9 +39,9 @@ import forge.toolbox.FEvent;
 import forge.toolbox.FList;
 import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
+import forge.toolbox.FOptionPane;
 import forge.toolbox.FScrollPane;
 import forge.util.Utils;
-import forge.util.gui.SOptionPane;
 
 public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
     private static final ForgePreferences prefs = FModel.getPreferences();
@@ -177,6 +177,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
     protected void initLobby(GameLobby lobby0) {
         lobby = lobby0;
         lobby.setListener(this);
+        btnStart.setVisible(lobby.hasControl());
     }
 
     private void updateVariantSelection() {
@@ -504,10 +505,13 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
     }
 
     void setReady(final int index, final boolean ready) {
-        if (ready && decks[index] == null) {
-            SOptionPane.showErrorDialog("Select a deck before readying!");
-            update(false);
-            return;
+        if (ready) {
+            updateDeck(index);
+            if (decks[index] == null) {
+                FOptionPane.showErrorDialog("Select a deck before readying!");
+                update(false);
+                return;
+            }
         }
 
         firePlayerChangeListener(index);
diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
index e3d11321a79..c2cb233b40d 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
@@ -614,7 +614,7 @@ public class PlayerPanel extends FContainer {
         avatarLabel.setEnabled(mayEdit);
         txtPlayerName.setEnabled(mayEdit);
         nameRandomiser.setEnabled(mayEdit);
-        humanAiSwitch.setEnabled(mayEdit && mayControl);
+        humanAiSwitch.setEnabled(mayEdit);
         updateVariantControlsVisibility();
 
         //if panel has height already, ensure height updated to account for button visibility changes
@@ -626,7 +626,6 @@ public class PlayerPanel extends FContainer {
     public void setMayControl(boolean mayControl0) {
         if (mayControl == mayControl0) { return; }
         mayControl = mayControl0;
-        humanAiSwitch.setEnabled(mayEdit && mayControl);
     }
 
     public void setMayRemove(boolean mayRemove0) {