MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed couple cases when update doesn't work (win specific). IDEA-CR-12103.

Browse Source
This commit is contained in:
Vladimir.Orlov
2016-07-11 09:21:25 +03:00
parent f352dd1129
commit 8664c58dd3
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/Restarter.java
+2 -7
View File
@@ -113,7 +113,7 @@ public class Restarter {
final int pid = kernel32.GetCurrentProcessId();
final IntByReference argc = new IntByReference();
Pointer argv_ptr = shell32.CommandLineToArgvW(kernel32.GetCommandLineW(), argc);
final String[] argv = argv_ptr.getWideStringArray(0, argc.getValue());
final String[] argv = getRestartArgv(argv_ptr.getWideStringArray(0, argc.getValue()));
kernel32.LocalFree(argv_ptr);
doScheduleRestart(new File(PathManager.getBinPath(), "restarter.exe"), new Consumer<List<String>>() {
@@ -153,10 +153,6 @@ public class Restarter {
if (argv[i].endsWith("com.intellij.idea.Main") ||
argv[i].endsWith(".exe")) {
countArgs = i + 1;
if ("0".equals(argv[2])) {
// update number of args in according with removed cmd line args
argv[3] = String.valueOf(Integer.valueOf(argv[3]) - (argv.length - (i+1)));
}
if (argv[i].endsWith(".exe") && argv[i].indexOf(File.separator) < 0) {
//absolute path
argv[i] = new File(PathManager.getBinPath(), argv[i]).getPath();
@@ -173,8 +169,7 @@ public class Restarter {
List<String> commands = new ArrayList<String>();
commands.add(createTempExecutable(restarterFile).getPath());
argumentsBuilder.consume(commands);
String[] argv = getRestartArgv(ArrayUtil.toStringArray(commands));
Runtime.getRuntime().exec(argv);
Runtime.getRuntime().exec(ArrayUtil.toStringArray(commands));
}
public static String getRestarterDir() {