From 46ffa1c4f0acaf7f7e5c8e6eace911dd7ab6fed7 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 15 Apr 2013 08:37:40 +0000 Subject: [PATCH] moved console update to EDT thread, this should solve NPE from http://www.slightlymagic.net/forum/viewtopic.php?p=115484#p115484 --- .../java/forge/gui/match/controllers/CLog.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/gui/match/controllers/CLog.java b/src/main/java/forge/gui/match/controllers/CLog.java index 681fb47a311..cd4d46dd787 100644 --- a/src/main/java/forge/gui/match/controllers/CLog.java +++ b/src/main/java/forge/gui/match/controllers/CLog.java @@ -4,6 +4,7 @@ import java.util.Observable; import java.util.Observer; import forge.Command; +import forge.FThreads; import forge.gui.framework.ICDoc; import forge.gui.match.views.VLog; @@ -32,13 +33,18 @@ public enum CLog implements ICDoc, Observer { public void initialize() { } + + private static Runnable updateConsole = new Runnable() { + + @Override + public void run() { + VLog.SINGLETON_INSTANCE.updateConsole(); + } + }; - /* (non-Javadoc) - * @see forge.gui.framework.ICDoc#update() - */ @Override public void update() { - VLog.SINGLETON_INSTANCE.updateConsole(); + FThreads.invokeInEdtNowOrLater(updateConsole); } /* (non-Javadoc)