Backport issue 1683 and issue 1725

git-svn-id: http://svn.dmdirc.com/branches/0.6@4615 00569f92-eb28-0410-84fd-f71c24880f

installer/windows/Uninstaller.dpr

@@ -208,10 +208,10 @@ begin
 		showmessage('DMDirc has been uninstalled from "'+InstallDir+'".', 'Uninstall Successful');
 	end
 	else if askQuestion('This will uninstall DMDirc. '+#13#10+#13#10+'Do you want to continue?') then begin
-		if (ExecAndWait('java -jar ' + ExtractFileDir(paramstr(0)) + '\DMDirc.jar -k', true) <> 0) then begin
+		if (ExecAndWait('java -jar "' + ExtractFileDir(paramstr(0)) + '\DMDirc.jar" -k', true) <> 0) then begin
 			TempDir := GetTempDirectory;
 			CopyFile(pchar(paramstr(0)), pchar(TempDir+'/uninstall.exe'), false);
-			Launch(TempDir+'/uninstall.exe '+ExtractFileDir(paramstr(0))+'\');
+			Launch('"'+TempDir+'/uninstall.exe" '+ExtractFileDir(paramstr(0))+'\');
 		end else begin
 			showError('Uninstall Aborted - DMDirc is still running.', 'Please close DMDirc before continuing')
 		end;

src/com/dmdirc/commandline/RemoteServer.java

@@ -41,9 +41,9 @@ import java.util.List;
 public class RemoteServer implements RemoteInterface {
     
     /** The minimum port to use for RMI binding. */
-    private static final int MINPORT = 1099;
+    private static final int MINPORT = 3634;
     /** The maximum port to use for RMI binding. */
-    private static final int MAXPORT = 1109;
+    private static final int MAXPORT = MINPORT + 5;
     /** The interface we're exposing. */
     private static final RemoteServer SERVER = new RemoteServer();