Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-01-09 09:09:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Изменена логика ожидания запуска с выключенной отладкой

Browse source
This commit is contained in:
Gravit 2019-03-24 15:52:50 +07:00
parent 28d592aa70
commit 376fa1b76e
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,8 @@
import java.nio.file.attribute.PosixFilePermission; import java.nio.file.attribute.PosixFilePermission;
import java.security.interfaces.RSAPublicKey; import java.security.interfaces.RSAPublicKey;
import java.util.*; import java.util.*;
import java.util.Timer;
import java.util.concurrent.TimeUnit;
public final class ClientLauncher { public final class ClientLauncher {
private static Gson gson = new Gson(); private static Gson gson = new Gson();
@ -294,6 +296,7 @@ private static void launch(ClientProfile profile, Params params) throws Throwabl
} }
private static Process process = null; private static Process process = null;
private static boolean clientStarted = false;
@LauncherAPI @LauncherAPI
public static Process launch( public static Process launch(
@ -325,8 +328,7 @@ public static Process launch(
assetHDir.write(output); assetHDir.write(output);
clientHDir.write(output); clientHDir.write(output);
} }
clientStarted = true;
} }
} catch (IOException e) { } catch (IOException e) {
LogHelper.error(e); LogHelper.error(e);
@ -386,7 +388,27 @@ public static Process launch(
} }
// Let's rock! // Let's rock!
process = builder.start(); process = builder.start();
if(!LogHelper.isDebugEnabled()) Thread.sleep(3000); //даем время потоку записи if(!LogHelper.isDebugEnabled()) {
for(int i=0;i<50;++i)
{
if(!process.isAlive())
{
int exitCode = process.exitValue();
LogHelper.error("Process exit code %d", exitCode);
break;
}
if(clientStarted)
{
break;
}
Thread.sleep(200);
}
if(!clientStarted)
{
LogHelper.error("Write Client Params not successful. Using debug mode for more information");
}
}
clientStarted = false;
return process; return process;
} }