From afbcd90ffcdae6ee13886146ba0934229a4911a9 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Fri, 29 Nov 2013 04:37:35 +0000
Subject: [PATCH] Don't switch to Combat pane unless an attacker is declared

---
 forge-gui/src/main/java/forge/gui/match/CMatchUI.java       | 2 +-
 .../src/main/java/forge/gui/match/controllers/CDetail.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java
index e45c0a747fb..2ccb1de0c93 100644
--- a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java
+++ b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java
@@ -297,7 +297,7 @@ public enum CMatchUI implements ICDoc, IMenuProvider {
     }
 
     public void showCombat(Combat combat) {
-        if (combat != null && combat.getAttackingPlayer().getGame().getStack().isEmpty()) {
+        if (combat != null && combat.getAttackers().size() > 0 && combat.getAttackingPlayer().getGame().getStack().isEmpty()) {
         	if (selectedDocBeforeCombat == null) {
 	        	IVDoc<? extends ICDoc> combatDoc = EDocID.REPORT_COMBAT.getDoc();
 	        	if (combatDoc.getParentCell() != null) {
diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java b/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java
index 5794e6cd972..22ee92332df 100644
--- a/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java
+++ b/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java
@@ -17,7 +17,6 @@
  */
 package forge.gui.match.controllers;
 
-import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
 import forge.Command;
@@ -25,6 +24,7 @@ import forge.Singletons;
 import forge.game.card.Card;
 import forge.gui.framework.ICDoc;
 import forge.gui.match.views.VDetail;
+import forge.gui.toolbox.FMouseAdapter;
 import forge.item.IPaperCard;
 import forge.item.InventoryItem;
 import forge.item.InventoryItemFromSet;
@@ -69,9 +69,9 @@ public enum CDetail implements ICDoc {
 
     @Override
     public void initialize() {
-        view.getPnlDetail().addMouseListener(new MouseAdapter() {
+        view.getPnlDetail().addMouseListener(new FMouseAdapter() {
             @Override
-            public void mouseClicked(final MouseEvent e) {
+            public void onLeftClick(final MouseEvent e) {
                 CPicture.SINGLETON_INSTANCE.flipCard();
             }
         });