[popfile-commit] windows installer.nsi,1.135,1.136

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

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

Modified Files:
	installer.nsi 
Log Message:
Correct the timeout bug introduced a few weeks ago (oops!).

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** installer.nsi	10 Oct 2003 10:46:13 -0000	1.135
--- installer.nsi	11 Oct 2003 13:17:38 -0000	1.136
***************
*** 115,119 ****
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "0.20.0RC3"
  
    !define C_README        "v0.20.0.change"
--- 115,119 ----
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "0.20.0RC4"
  
    !define C_README        "v0.20.0.change"
***************
*** 2179,2182 ****
--- 2179,2183 ----
    !define L_TRAY        $R6   ; set to 'i' if system tray enabled, otherwise set to ""
    !define L_CONSOLE     $R5   ; new console mode: 0 = disabled, 1 = enabled
+   !define L_TIMEOUT     $R4   ; used to wait for the UI to respond (when starting POPFile)
  
    Push ${L_CFG}
***************
*** 2185,2188 ****
--- 2186,2190 ----
    Push ${L_TRAY}
    Push ${L_CONSOLE}
+   Push ${L_TIMEOUT}
  
    StrCpy ${L_TRAY} "i"    ; the default is to enable the system tray icon
***************
*** 2271,2275 ****
    ; Wait until POPFile is ready to display the UI (may take a second or so)
  
!   StrCpy ${L_TEMP} ${C_STARTUP_LIMIT}   ; Timeout limit to avoid an infinite loop
  
  check_if_ready:
--- 2273,2277 ----
    ; Wait until POPFile is ready to display the UI (may take a second or so)
  
!   StrCpy ${L_TIMEOUT} ${C_STARTUP_LIMIT}   ; Timeout limit to avoid an infinite loop
  
  check_if_ready:
***************
*** 2278,2283 ****
    StrCmp ${L_TEMP} "success" remove_banner
    Sleep ${C_STARTUP_DELAY}
!   IntOp ${L_TEMP} ${L_TEMP} - 1
!   IntCmp ${L_TEMP} 0 remove_banner remove_banner check_if_ready
  
  remove_banner:
--- 2280,2285 ----
    StrCmp ${L_TEMP} "success" remove_banner
    Sleep ${C_STARTUP_DELAY}
!   IntOp ${L_TIMEOUT} ${L_TIMEOUT} - 1
!   IntCmp ${L_TIMEOUT} 0 remove_banner remove_banner check_if_ready
  
  remove_banner:
***************
*** 2286,2289 ****
--- 2288,2292 ----
  exit_without_banner:
  
+   Pop ${L_TIMEOUT}
    Pop ${L_CONSOLE}
    Pop ${L_TRAY}
***************
*** 2297,2300 ****
--- 2300,2304 ----
    !undef L_TRAY
    !undef L_CONSOLE
+   !undef L_TIMEOUT
  
  FunctionEnd