[Jake2-commits] jake2/src/jake2/install Q2DataInstaller.java,1.1,1.1.2.1

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/install
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2329/src/jake2/install

Modified Files:
      Tag: software20
	Q2DataInstaller.java 
Log Message:


Index: Q2DataInstaller.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/install/Q2DataInstaller.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** Q2DataInstaller.java	24 Oct 2004 20:40:07 -0000	1.1
--- Q2DataInstaller.java	26 Oct 2004 14:43:22 -0000	1.1.2.1
***************
*** 402,408 ****
  		
  		private void ok() {
! 			if (!install.isSelected()) System.exit(0);
  			parent.progressPanel.destDir = parent.destdir;
! 			parent.progressPanel.mirror = "q2-314-demo-x86.exe";
  			parent.showProgressPanel();
  			new Thread(parent.progressPanel).start();
--- 402,411 ----
  		
  		private void ok() {
! 			if (!install.isSelected()) {
! 			    parent.okButtonActionPerformed(null);
! 			    System.exit(0);
! 			}
  			parent.progressPanel.destDir = parent.destdir;
! 			parent.progressPanel.mirror = "../Quake2Demo/q2-314-demo-x86.exe";
  			parent.showProgressPanel();
  			new Thread(parent.progressPanel).start();
***************
*** 705,712 ****
  		
  		void endInstall(String message) {
! 			parent.notFoundPanel.message.setText(message);
! 			parent.dir = destDir + "/baseq2";
! 			parent.showChooseDialog();
! 			parent.okButtonActionPerformed(null);		
  		}
  		
--- 708,713 ----
  		
  		void endInstall(String message) {
! 			parent.okButtonActionPerformed(null);
! 			System.exit(0);
  		}
  		
***************
*** 744,748 ****
  		installer.installQ2Data();
  		
- 		System.exit(0);
  	}
  }
--- 745,748 ----