From ee5831bdc9670355443ad0810b6fb12e235656e8 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 28 Aug 2014 01:30:04 +0200
Subject: [PATCH] * Moved workaround for #451 to first possible position main
 of client.

---
 Mage.Client/src/main/java/mage/client/MageFrame.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 7d98481920d..745c3e012c4 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -172,9 +172,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
         setTitle("XMage, version " + version);
         clientId = UUID.randomUUID();
-        // Workaround for #451
-        System.setProperty("java.util.Arrays.useLegacyMergeSort", "true");
-        
         EDTExceptionHandler.registerExceptionHandler();
         addWindowListener(new WindowAdapter() {
             @Override
@@ -1091,9 +1088,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
      * @param args the command line arguments
      */
     public static void main(final String args[]) {
+         // Workaround for #451
+        System.setProperty("java.util.Arrays.useLegacyMergeSort", "true");
 
         startTime = System.currentTimeMillis();
-
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
             @Override
             public void uncaughtException(Thread t, Throwable e) {