external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix so downloader doesn't cause infinite loop

Browse Source
This commit is contained in:
drdev
2014-05-28 00:28:40 +00:00
parent c07f8d5e9b
commit 5c2f3ddf85
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/Forge.java
View File

@@ -74,7 +74,7 @@ public class Forge implements ApplicationListener {
splashScreen = new SplashScreen(); splashScreen = new SplashScreen();
//load model on background thread (using progress bar to report progress) //load model on background thread (using progress bar to report progress)
new Thread(new Runnable() { FThreads.invokeInBackgroundThread(new Runnable() {
@Override @Override
public void run() { public void run() {
FModel.initialize(splashScreen.getProgressBar()); FModel.initialize(splashScreen.getProgressBar());
@@ -91,7 +91,7 @@ public class Forge implements ApplicationListener {
} }
}); });
} }
}, "Game Startup").start(); //use thread name that starts with "Game" so GuiMobile.isGuiThread() returns false });
} }
private void afterDbLoaded() { private void afterDbLoaded() {

7
forge-gui/src/main/java/forge/FThreads.java
View File

@@ -53,6 +53,13 @@ public class FThreads {
GuiBase.getInterface().invokeInEdtAndWait(proc); GuiBase.getInterface().invokeInEdtAndWait(proc);
} }
private static int backgroundThreadCount;
public static void invokeInBackgroundThread(final Runnable proc) {
//start thread name with "Game" so isGuiThread() returns false on GuiMobile
new Thread(proc, "Game BT" + backgroundThreadCount).start();
backgroundThreadCount++;
}
public static boolean isGuiThread() { public static boolean isGuiThread() {
return GuiBase.getInterface().isGuiThread(); return GuiBase.getInterface().isGuiThread();
} }

7
forge-gui/src/main/java/forge/download/GuiDownloadService.java
View File

@@ -28,7 +28,6 @@ import forge.interfaces.IProgressBar;
import forge.interfaces.ITextField; import forge.interfaces.ITextField;
import forge.util.FileUtil; import forge.util.FileUtil;
import forge.util.MyRandom; import forge.util.MyRandom;
import forge.util.ThreadUtil;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@@ -60,7 +59,7 @@ public abstract class GuiDownloadService implements Runnable {
public void run() { public void run() {
//invalidate image cache so newly downloaded images will be loaded //invalidate image cache so newly downloaded images will be loaded
GuiBase.getInterface().clearImageCache(); GuiBase.getInterface().clearImageCache();
ThreadUtil.invokeInGameThread(this); FThreads.invokeInBackgroundThread(GuiDownloadService.this);
btnStart.setEnabled(false); btnStart.setEnabled(false);
} }
}; };
@@ -87,8 +86,8 @@ public abstract class GuiDownloadService implements Runnable {
cmdClose = cmdClose0; cmdClose = cmdClose0;
onUpdate = onUpdate0; onUpdate = onUpdate0;
// Free up the EDT by assembling card list on the game thread // Free up the EDT by assembling card list on a background thread
ThreadUtil.invokeInGameThread(new Runnable() { FThreads.invokeInBackgroundThread(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {