[vidalia-svn] r3913: There was an if-statement cleverly disguised as SectionGetFl (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-06-28 22:37:35 -0400 (Sun, 28 Jun 2009)
New Revision: 3913

Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:

There was an if-statement cleverly disguised as 
   SectionGetFlags ${Vidalia} $0
   IntOp $0 $0 & ${SF_SELECTED}
   IntCmp $0 ${SF_SELECTED} skiptorrc
that would lead to skipping Tor's geoip file if the Vidalia option was
also selected. 


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-06-29 02:20:16 UTC (rev 3912)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-06-29 02:37:35 UTC (rev 3913)
@@ -248,7 +248,10 @@
        File "@TOR_PACKAGE_DIR@\tor.exe"
        File "@TOR_PACKAGE_DIR@\tor-resolve.exe"
        WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "https://www.torproject.org";
-
+       ; Include tor's geoip file, too
+       SetOutPath "$APPDATA\Tor"
+       File "@TOR_PACKAGE_DIR@\geoip"
+       
        ; If the user is also installing Vidalia, then don't confuse them by
        ; an extra torrc in %APPDATA%\Tor
        SectionGetFlags ${Vidalia} $0
@@ -256,11 +259,7 @@
        IntCmp $0 ${SF_SELECTED} skiptorrc
 
        StrCpy $configfile "torrc"
-       SetOutPath "$APPDATA\Tor"
 
-       ; Include tor's geoip file, too
-       File "@TOR_PACKAGE_DIR@\geoip"
-
        ; If there's already a torrc config file, ask if they want to
        ; overwrite it with the new one.
        IfFileExists "$APPDATA\Tor\torrc" "" endiftorrc