From 02ca83324c59317a844792a03de75b7ce2c27651 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 26 Sep 2014 13:44:57 +0200 Subject: [PATCH] * Client - Don't load games again if not neccessary if "Games" menu item is clicked. --- .../src/main/java/mage/client/MageFrame.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 660cd8608d4..f2be8391f95 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -976,13 +976,19 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } public void showGames(boolean setActive) { - MagePane topPane = getTopMost(tablesPane); - this.tablesPane.setVisible(true); - this.tablesPane.showTables(); - setActive(tablesPane); - if (!setActive && topPane != null) { - setActive(topPane); + MagePane topPanebefore = getTopMost(tablesPane); + if (!tablesPane.isVisible()) { + this.tablesPane.setVisible(true); + this.tablesPane.showTables(); } + if (setActive) { + setActive(tablesPane); + } else { + // if other panel was already shown, mamke sure it's topmost again + if (topPanebefore != null) { + setActive(topPanebefore); + } + } } public void hideGames() {