echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge of '2695182df34f8500e1b5d93d7337a46b8a4656f4'

Browse Source 
and '2ef560b013d5341eefa6cee116c1f6d06161e9b1'
This commit is contained in:
mathiasdm
2011-02-18 07:08:49 +00:00
parent bd28397f83 ef50c122fc
commit d4fce3b98e
7 changed files with 243 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -329,7 +329,9 @@ public class RouterConsoleRunner {
//TODO: move away from routerconsole into a separate application.
//ApplicationManager?
VersionComparator v = new VersionComparator();
if(v.compare(System.getProperty("java.runtime.version"), "1.6") >= 0) {
String desktopguiEnabled = I2PAppContext.getGlobalContext().getProperty("desktopgui.enabled");
int recentJava = v.compare(System.getProperty("java.runtime.version"), "1.6");
if(recentJava >= 0 && (desktopguiEnabled == null || desktopguiEnabled.equalsIgnoreCase("true"))) {
String[] args = new String[0];
net.i2p.desktopgui.Main.beginStartup(args);
}