Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Фикс порядка вызова missArchJava

Browse source
This commit is contained in:
Gravit 2019-03-24 03:39:32 +07:00
parent 4fe0bf4195
commit a8db9c8aeb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
View file

@ -386,7 +386,7 @@ public static Process launch(
} }
// Let's rock! // Let's rock!
process = builder.start(); process = builder.start();
if(!LogHelper.isDebugEnabled()) Thread.sleep(1000); //даем время потоку записи if(!LogHelper.isDebugEnabled()) Thread.sleep(3000); //даем время потоку записи
return process; return process;
} }
@ -397,7 +397,6 @@ public static void main(String... args) throws Throwable {
LauncherConfig.getAutogenConfig().initModules(); //INIT LauncherConfig.getAutogenConfig().initModules(); //INIT
initGson(); initGson();
Launcher.modulesManager.preInitModules(); Launcher.modulesManager.preInitModules();
checkJVMBitsAndVersion();
JVMHelper.verifySystemProperties(ClientLauncher.class, true); JVMHelper.verifySystemProperties(ClientLauncher.class, true);
EnvHelper.checkDangerousParams(); EnvHelper.checkDangerousParams();
JVMHelper.checkStackTrace(ClientLauncher.class); JVMHelper.checkStackTrace(ClientLauncher.class);
@ -430,6 +429,7 @@ public static void main(String... args) throws Throwable {
} }
Launcher.profile = profile; Launcher.profile = profile;
Request.setSession(params.session); Request.setSession(params.session);
checkJVMBitsAndVersion();
Launcher.modulesManager.initModules(); Launcher.modulesManager.initModules();
// Verify ClientLauncher sign and classpath // Verify ClientLauncher sign and classpath
LogHelper.debug("Verifying ClientLauncher sign and classpath"); LogHelper.debug("Verifying ClientLauncher sign and classpath");

2
modules

@ -1 +1 @@
Subproject commit 0e32128c6c8f569d67eff4e94777c6b8ef696345 Subproject commit 073b52f785527e01ca548fc56b71130b41ce648e