[popfile-commit] windows installer.nsi,1.58,1.59

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv27609

Modified Files:
	installer.nsi 
Log Message:
Shutdown existing POPFile before overwriting it. Allow user to start POPFile and the UI.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** installer.nsi	9 Jun 2003 18:35:16 -0000	1.58
--- installer.nsi	12 Jun 2003 15:04:48 -0000	1.59
***************
*** 3,8 ****
  # installer.nsi --- This is the NSIS script used to create the
  #                   Windows installer for POPFile. This script uses
! #                   two custom pages whose layouts are defined
! #                   in the files "ioA.ini" and "ioB.ini".
  #
  # Copyright (c) 2001-2003 John Graham-Cumming
--- 3,8 ----
  # installer.nsi --- This is the NSIS script used to create the
  #                   Windows installer for POPFile. This script uses
! #                   three custom pages whose layouts are defined
[...1107 lines suppressed...]
  
--- 1371,1375 ----
    Pop $1
    Exch $0           ; place result on top of the stack
! 
    !undef DECIMAL_DIGIT
  
***************
*** 1224,1228 ****
      IntCmp $R1 0 no_trim_needed
      StrCpy $R0 $R0 $R1
!     
    no_trim_needed:
      Pop $R2
--- 1405,1409 ----
      IntCmp $R1 0 no_trim_needed
      StrCpy $R0 $R0 $R1
! 
    no_trim_needed:
      Pop $R2