From a6ed6d7600b195f0ddadf7b8db5b77e12c615328 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Tue, 4 Jun 2013 06:15:38 +0000
Subject: [PATCH] SLayoutIO Will catch more general exceptions - not just the
 ones related to malformed xml. FControl.mayShowCard - will show card anyway
 wihout further checks if game has no human player

---
 src/main/java/forge/control/FControl.java        | 2 +-
 src/main/java/forge/gui/framework/SLayoutIO.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java
index a4d5c27ff56..9c1bd250fa9 100644
--- a/src/main/java/forge/control/FControl.java
+++ b/src/main/java/forge/control/FControl.java
@@ -329,7 +329,7 @@ public enum FControl {
     
     public boolean mayShowCard(Card c) {
         if ( game == null ) return true;
-        return c.canBeShownTo(getCurrentPlayer());
+        return !gameHasHumanPlayer || c.canBeShownTo(getCurrentPlayer());
     }
 
     /**
diff --git a/src/main/java/forge/gui/framework/SLayoutIO.java b/src/main/java/forge/gui/framework/SLayoutIO.java
index 41d1cb907a4..9911ce63608 100644
--- a/src/main/java/forge/gui/framework/SLayoutIO.java
+++ b/src/main/java/forge/gui/framework/SLayoutIO.java
@@ -173,7 +173,7 @@ public final class SLayoutIO {
             try {
                 xer = inputFactory.createXMLEventReader(fis); 
                 model = readLayout(xer);
-            } catch (final XMLStreamException e) {
+            } catch (final Exception e) { // I don't care what happened inside, the layout is wrong
                 try {
                     if ( xer != null ) xer.close();
                 } catch (final XMLStreamException x) {