From 3191ad7e320420f6d98b037fc1a7251b14e533a5 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Fri, 15 Mar 2013 11:53:32 +0400
Subject: [PATCH] Fixed Issue#158: The select a pile window is shown over the
 tooltip window

---
 .../src/main/java/mage/client/dialog/PickPileDialog.java      | 2 +-
 Mage.Client/src/main/java/mage/client/game/GamePanel.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/dialog/PickPileDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PickPileDialog.java
index e9dfcdd5206..ffc576b1860 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PickPileDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/PickPileDialog.java
@@ -96,7 +96,7 @@ public class PickPileDialog extends MageDialog {
         this.pile2.loadCardsNarrow(pile2, bigCard, dimension, gameId, null);
 
         if (getParent() != MageFrame.getDesktop() /*|| this.isClosed*/) {
-            MageFrame.getDesktop().add(this, JLayeredPane.POPUP_LAYER);
+            MageFrame.getDesktop().add(this, JLayeredPane.MODAL_LAYER);
         }
         pack();
 
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 5a04119ff5e..fa202cde922 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -95,9 +95,9 @@ public final class GamePanel extends javax.swing.JPanel {
 
         combat = new CombatDialog();
         pickNumber = new PickNumberDialog();
-        MageFrame.getDesktop().add(combat, JLayeredPane.POPUP_LAYER);
+        MageFrame.getDesktop().add(combat, JLayeredPane.MODAL_LAYER);
         combat.hideDialog();
-        MageFrame.getDesktop().add(pickNumber, JLayeredPane.POPUP_LAYER);
+        MageFrame.getDesktop().add(pickNumber, JLayeredPane.MODAL_LAYER);
 
         this.feedbackPanel.setConnectedChatPanel(this.userChatPanel);