# HG changeset patch
# User Dan
# Date 1243401431 14400
# Node ID 0c0d5dadfca3c3bf8e636141a8e99837e1f731ca
# Parent  ac5bcb4e52842d5d0dbba415d0a286c8d07e5a3d
Added LockWindow calls to all custom page exit paths to smooth transitions

diff -r ac5bcb4e5284 -r 0c0d5dadfca3 pages/DatabaseConfig.nsi
--- a/pages/DatabaseConfig.nsi	Wed May 27 01:15:21 2009 -0400
+++ b/pages/DatabaseConfig.nsi	Wed May 27 01:17:11 2009 -0400
@@ -125,7 +125,8 @@
         Abort
         
       ; If we're root, we can assume the login doesn't exist yet, so skip the validation
-      IntCmp $db_needroot 0 +2
+      IntCmp $db_needroot 0 +3
+        LockWindow on
         Return
         
       ${db_connect} $R0 $db_user $db_password
@@ -144,6 +145,7 @@
                                            fail. This option is recommended only for advanced users." IDYES +2
         Abort ; on No
       
+      LockWindow on
       Return
       
     GenerateRandomLogin:
@@ -151,6 +153,7 @@
       StrCpy $db_user "bn_enanocms"
       Call GenerateRandomPassword
       Pop $db_password
+      LockWindow on
       Return
   
 FunctionEnd
diff -r ac5bcb4e5284 -r 0c0d5dadfca3 pages/Login.nsi
--- a/pages/Login.nsi	Wed May 27 01:15:21 2009 -0400
+++ b/pages/Login.nsi	Wed May 27 01:17:11 2009 -0400
@@ -30,5 +30,7 @@
   StrCmp $admin_email "" 0 +3
     MessageBox MB_OK|MB_ICONEXCLAMATION "Please enter your e-mail address."
     Abort
+    
+  LockWindow on
 FunctionEnd
 
diff -r ac5bcb4e5284 -r 0c0d5dadfca3 pages/SiteConfig.nsi
--- a/pages/SiteConfig.nsi	Wed May 27 01:15:21 2009 -0400
+++ b/pages/SiteConfig.nsi	Wed May 27 01:17:11 2009 -0400
@@ -37,10 +37,12 @@
   ReadINIStr $0 "$PLUGINSDIR\SiteConfig.ini" "Field 6" "State"
   IntCmp $0 1 0 +2 +2
     StrCpy $start_with "tutorial"
+    
+  LockWindow on
 FunctionEnd
 
 Function CleanCopyright
   Pop $0
-  ${str_replace} $0 "©" "©" "$0"
+  ${str_replace} $0 "�" "©" "$0"
   Push $0
 FunctionEnd
diff -r ac5bcb4e5284 -r 0c0d5dadfca3 pages/StackSelect.nsi
--- a/pages/StackSelect.nsi	Wed May 27 01:15:21 2009 -0400
+++ b/pages/StackSelect.nsi	Wed May 27 01:17:11 2009 -0400
@@ -32,12 +32,14 @@
       ; User selected WAMP
       Call BNSetVarsForWAMP
       !insertmacro ConfigCheck
+      LockWindow on
       Return
       
     UserSelectedWAPP:
       ; User selected WAPP
       Call BNSetVarsForWAPP
       !insertmacro ConfigCheck
+      LockWindow on
       Return
   
   OnlyOneStackInstalled:
@@ -45,11 +47,13 @@
     ; MySQL
     Call BNSetVarsForWAMP
     !insertmacro ConfigCheck
+    LockWindow on
     Return
     
     ; PostgreSQL
     Call BNSetVarsForWAPP
     !insertmacro ConfigCheck
+    LockWindow on
     Return
 FunctionEnd