minor console/update cleanups

2012-12-22 18:37:26 +00:00
parent 81975e919b
commit 470b8c59e7
3 changed files with 10 additions and 3 deletions
--- a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java
@@ -230,10 +230,12 @@ public class NewsHelper extends ContentHelper {
     *  @since 0.9.4 moved from NewsFetcher
     */
    public static boolean dontInstall(RouterContext ctx) {
+        boolean disabled = ctx.getBooleanProperty(ConfigUpdateHandler.PROP_UPDATE_DISABLED);
+        if (disabled)
+            return true;
        File test = new File(ctx.getBaseDir(), "history.txt");
        boolean readonly = ((test.exists() && !test.canWrite()) || (!ctx.getBaseDir().canWrite()));
-        boolean disabled = ctx.getBooleanProperty(ConfigUpdateHandler.PROP_UPDATE_DISABLED);
-        return readonly || disabled;
+        return readonly;
    }

    /**