|
@@ -460,7 +460,7 @@ begin
|
460
|
460
|
if (ReleaseNumber <> '') then begin
|
461
|
461
|
params := params+' --release '+ReleaseNumber;
|
462
|
462
|
end;
|
463
|
|
- // CHeck if the installer runs
|
|
463
|
+ // Check if the installer runs
|
464
|
464
|
if (ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main --help') <> 0) then begin
|
465
|
465
|
dowriteln('Failed!');
|
466
|
466
|
if not installJRE(true) then begin
|
|
@@ -471,6 +471,7 @@ begin
|
471
|
471
|
// Try again now that java is installed.
|
472
|
472
|
ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
|
473
|
473
|
end;
|
|
474
|
+ end
|
474
|
475
|
else begin
|
475
|
476
|
// Java is the right version, run the installer
|
476
|
477
|
ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
|