浏览代码

Backport issue 1683 and issue 1725


git-svn-id: http://svn.dmdirc.com/branches/0.6@4615 00569f92-eb28-0410-84fd-f71c24880f
remotes/0.6
Chris Smith 16 年前
父节点
当前提交
2c26c8379f
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2
    2
      installer/windows/Uninstaller.dpr
  2. 2
    2
      src/com/dmdirc/commandline/RemoteServer.java

+ 2
- 2
installer/windows/Uninstaller.dpr 查看文件

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

+ 2
- 2
src/com/dmdirc/commandline/RemoteServer.java 查看文件

41
 public class RemoteServer implements RemoteInterface {
41
 public class RemoteServer implements RemoteInterface {
42
     
42
     
43
     /** The minimum port to use for RMI binding. */
43
     /** The minimum port to use for RMI binding. */
44
-    private static final int MINPORT = 1099;
44
+    private static final int MINPORT = 3634;
45
     /** The maximum port to use for RMI binding. */
45
     /** The maximum port to use for RMI binding. */
46
-    private static final int MAXPORT = 1109;
46
+    private static final int MAXPORT = MINPORT + 5;
47
     /** The interface we're exposing. */
47
     /** The interface we're exposing. */
48
     private static final RemoteServer SERVER = new RemoteServer();
48
     private static final RemoteServer SERVER = new RemoteServer();
49
     
49
     

正在加载...
取消
保存