From 3ee044c254a28a337d9eccce61454654f74e9daa Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Thu, 11 May 2017 17:26:46 +0000
Subject: [PATCH] - Ensure that restoreOldZones in Mobile Forge only accepts
 correct objects when processing player InfoTabs (otherwise the game may crash
 or hang under certain circumstances when an unexpectedly filled Object set is
 passed in VStack).

---
 forge-gui-mobile/src/forge/screens/match/MatchController.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java
index fef1d582ec1..edee7967e71 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchController.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java
@@ -303,7 +303,9 @@ public class MatchController extends AbstractGuiGame {
     public void restoreOldZones(final Map<PlayerView, Object> playersToRestoreZonesFor) {
         for (final Entry<PlayerView, Object> player : playersToRestoreZonesFor.entrySet()) {
             final VPlayerPanel playerPanel = view.getPlayerPanel(player.getKey());
-            playerPanel.setSelectedTab((InfoTab)player.getValue());
+            if (player.getValue() == null || player.getValue() instanceof InfoTab) {
+                playerPanel.setSelectedTab((InfoTab) player.getValue());
+            }
         }
     }