Issue #241 Fixed not starting application

version changed to 1.6.6u2
This commit is contained in:
Jindra Petk
2013-07-16 18:07:16 +02:00
parent 7e7450cf32
commit d02e4daf72
2 changed files with 14 additions and 11 deletions

View File

@@ -2,8 +2,8 @@
<project name="FFDec" basedir="." default="all">
<description>Builds project FFDec</description>
<property name="VERSION" value="1.6.6u1" />
<property name="VERSIONNUMBER" value="1.6.6.1" />
<property name="VERSION" value="1.6.6u2" />
<property name="VERSIONNUMBER" value="1.6.6.2" />
<property name="BUILDER" value="jpexs" />
<property name="PROJECTNAME" value="FFDec"/>
<property name="JARFILENAME" value="ffdec"/>

View File

@@ -462,7 +462,9 @@ public class Main {
}
public static void initLang() {
Locale.setDefault(Locale.forLanguageTag((String) Configuration.getConfig("locale", Locale.getDefault())));
if (Configuration.containsConfig("locale")) {
Locale.setDefault(Locale.forLanguageTag((String) Configuration.getConfig("locale", "en")));
}
UIManager.put("OptionPane.okButtonText", AppStrings.translate("button.ok"));
UIManager.put("OptionPane.yesButtonText", AppStrings.translate("button.yes"));
UIManager.put("OptionPane.noButtonText", AppStrings.translate("button.no"));
@@ -521,14 +523,6 @@ public class Main {
public static void main(String[] args) throws IOException {
loadProperties();
Configuration.loadFromFile(getConfigFile(), getReplacementsFile());
initLang();
View.setLookAndFeel();
if ((Boolean) Configuration.getConfig("cacheOnDisk", Boolean.TRUE)) {
Cache.setStorageType(Cache.STORAGE_FILES);
} else {
Cache.setStorageType(Cache.STORAGE_MEMORY);
}
int pos = 0;
if (args.length > 0) {
if (args[0].equals("-debug")) {
@@ -537,6 +531,15 @@ public class Main {
}
}
initLogging(Configuration.debugMode);
initLang();
View.setLookAndFeel();
if ((Boolean) Configuration.getConfig("cacheOnDisk", Boolean.TRUE)) {
Cache.setStorageType(Cache.STORAGE_FILES);
} else {
Cache.setStorageType(Cache.STORAGE_MEMORY);
}
if (args.length < pos + 1) {
autoCheckForUpdates();
offerAssociation();