Merge origin/master

Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
This commit is contained in:
LevelX2 2016-03-03 23:22:06 +01:00
commit 3f57012c85
5 changed files with 81 additions and 48 deletions

View file

@ -47,8 +47,8 @@ public class EDTExceptionHandler implements Thread.UncaughtExceptionHandler {
public void handle(Throwable throwable) {
try {
logger.fatal(null, throwable);
JOptionPane.showMessageDialog(MageFrame.getDesktop(), throwable, "MAGE Client UI error", JOptionPane.ERROR_MESSAGE);
logger.fatal("MAGE Client UI error", throwable);
// JOptionPane.showMessageDialog(MageFrame.getDesktop(), throwable, "MAGE Client UI error", JOptionPane.ERROR_MESSAGE);
} catch (Throwable t) {}
}