Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/java/net/runelite/launcher/Launcher.java

src/main/java/net/runelite/launcher/Launcher.java

@@ -81,6 +81,7 @@ public class Launcher
 	private static final String USER_AGENT = "RuneLite/" + PROPERTIES.getVersion();
 	private static final boolean enforceDependencyHashing = true;
 	private static final boolean staging = false;
+	private static final File CRASH_FILES = new File(LOGS_DIR, "jvm_crash_pid_%p.log");
 
 	static final String CLIENT_MAIN_CLASS = "net.runelite.client.RuneLite";
 
@@ -150,6 +151,10 @@ public static void main(String[] args)
 		// Set all JVM params
 		setJvmParams(extraJvmParams);
 
+		// Set hs_err_pid location (do this after setJvmParams because it can't be set at runtime)
+		log.debug("Setting JVM crash log location to {}", CRASH_FILES);
+		extraJvmParams.add("-XX:ErrorFile=" + CRASH_FILES.getAbsolutePath());
+
 		try
 		{
 			UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
@@ -176,7 +181,7 @@ public static void main(String[] args)
 		}
 
 		// update packr vmargs
-		PackrConfig.updateLauncherArgs(bootstrap);
+		PackrConfig.updateLauncherArgs(bootstrap, extraJvmParams);
 
 		REPO_DIR.mkdirs();
 

src/main/java/net/runelite/launcher/PackrConfig.java

@@ -32,6 +32,9 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.launcher.beans.Bootstrap;
@@ -40,7 +43,7 @@
 public class PackrConfig
 {
 	// Update the packr vmargs
-	public static void updateLauncherArgs(Bootstrap bootstrap)
+	public static void updateLauncherArgs(Bootstrap bootstrap, Collection<String> extraJvmArgs)
 	{
 		File configFile = new File("config.json").getAbsoluteFile();
 
@@ -63,13 +66,17 @@ public static void updateLauncherArgs(Bootstrap bootstrap)
 			return;
 		}
 
-		String[] args = getArgs(bootstrap);
-		if (args == null || args.length == 0)
+		String[] argsArr = getArgs(bootstrap);
+		if (argsArr == null || argsArr.length == 0)
 		{
 			log.warn("Launcher args are empty");
 			return;
 		}
 
+		// Insert JVM arguments to config.json because some of them require restart
+		List<String> args = Arrays.asList(argsArr);
+		args.addAll(extraJvmArgs);
+
 		config.put("vmArgs", args);
 
 		try (PrintWriter writer = new PrintWriter(new FileOutputStream(configFile)))