Browse Source

Fix windows installer.

Fixes issue 1569


git-svn-id: http://svn.dmdirc.com/trunk@4470 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Shane Mc Cormack 16 years ago
parent
commit
65c205a5f1
1 changed files with 2 additions and 1 deletions
  1. 2
    1
      installer/windows/Setup.dpr

+ 2
- 1
installer/windows/Setup.dpr View File

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

Loading…
Cancel
Save