From 526a93df7eb502cb42accebf87baaa9f6457bf1e Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 14 Jun 2015 02:42:32 +0200
Subject: [PATCH] Some fixes to user table.

---
 Mage.Client/src/main/java/mage/client/chat/ChatPanel.java     | 4 ++--
 .../mage/client/util/gui/countryBox/CountryCellRenderer.java  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
index 19b2a67bb11..12b95847501 100644
--- a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
+++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
@@ -335,8 +335,8 @@ public class ChatPanel extends javax.swing.JPanel {
             JTableHeader th = jTablePlayers.getTableHeader();
             TableColumnModel tcm = th.getColumnModel();
             
-            tcm.getColumn(1).setHeaderValue("Players (" + this.players.length + ")");
-            tcm.getColumn(3).setHeaderValue(
+            tcm.getColumn(jTablePlayers.convertColumnIndexToView(1)).setHeaderValue("Players (" + this.players.length + ")");
+            tcm.getColumn(jTablePlayers.convertColumnIndexToView(3)).setHeaderValue(
                     "Games " + roomUserInfo.getNumberActiveGames() +
                     (roomUserInfo.getNumberActiveGames() != roomUserInfo.getNumberGameThreads() ? " (T:" + roomUserInfo.getNumberGameThreads():" (") +
                     " limit: " + roomUserInfo.getNumberMaxGames() + ")");
diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryCellRenderer.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryCellRenderer.java
index ddcc10aee5c..cc26e5bedca 100644
--- a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryCellRenderer.java
+++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryCellRenderer.java
@@ -35,7 +35,6 @@ import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
-import mage.client.chat.ChatPanel;
 import org.apache.log4j.Logger;
 
 /**
@@ -58,7 +57,7 @@ public class CountryCellRenderer extends DefaultTableCellRenderer {
     @Override
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
     	JLabel label = (JLabel)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-    	if(column == 0) {
+    	if(table.convertColumnIndexToView(0) == column) {
             label.setToolTipText(countryMap.get((String)value));
             label.setIcon(getCountryFlagIcon((String)value));  
             label.setText("");