diff --git a/core/src/main/java/com/threerings/getdown/data/Application.java b/core/src/main/java/com/threerings/getdown/data/Application.java index 90cf59b..926b7c9 100644 --- a/core/src/main/java/com/threerings/getdown/data/Application.java +++ b/core/src/main/java/com/threerings/getdown/data/Application.java @@ -747,6 +747,7 @@ public class Application _dockName = config.getString("ui.name"); _dockIconPath = config.getString("ui.mac_dock_icon", "../desktop.icns"); + _timeoutVerify = config.getInt("timeout_verify", 60); return config; } @@ -1312,7 +1313,10 @@ public class Application while (completed[0] < rsrcs.size()) { // we should be getting progress completion updates WAY more often than one every // minute, so if things freeze up for 60 seconds, abandon ship - Runnable action = actions.poll(60, TimeUnit.SECONDS); + Runnable action = actions.poll(_timeoutVerify, TimeUnit.SECONDS); + if (action == null) { + throw new IllegalStateException("m.timeout_verify"); + } action.run(); } @@ -1753,6 +1757,8 @@ public class Application protected List _codes = new ArrayList<>(); protected List _resources = new ArrayList<>(); + protected int _timeoutVerify = 60; + protected boolean _useCodeCache; protected int _codeCacheRetentionDays; diff --git a/launcher/src/main/resources/com/threerings/getdown/messages.properties b/launcher/src/main/resources/com/threerings/getdown/messages.properties index 19b2999..a70fccb 100644 --- a/launcher/src/main/resources/com/threerings/getdown/messages.properties +++ b/launcher/src/main/resources/com/threerings/getdown/messages.properties @@ -101,6 +101,8 @@ m.another_getdown_running = Multiple instances of this application's \ m.applet_stopped = Getdown's applet was told to stop working. +m.timeout_verify = Timeout verifying resources + # application/digest errors m.missing_appbase = The configuration file is missing the 'appbase'. m.invalid_version = The configuration file specifies an invalid version. diff --git a/launcher/src/main/resources/com/threerings/getdown/messages_de.properties b/launcher/src/main/resources/com/threerings/getdown/messages_de.properties index 8e36835..c359f4d 100644 --- a/launcher/src/main/resources/com/threerings/getdown/messages_de.properties +++ b/launcher/src/main/resources/com/threerings/getdown/messages_de.properties @@ -105,6 +105,7 @@ Vorgang erledigen lassen. m.applet_stopped = Die Anwendung wurde beendet. +m.timeout_verify = Timeout beim Verifizieren der Resourcen # application/digest errors m.missing_appbase = In der Konfigurationsdatei fehlt die 'appbase'.