merged trunk r2528 into us_maker branch

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2530 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 7 insertions, 7 deletions

diff --git a/us_maker_edition/installer/settings/files_main_install.nsh b/us_maker_edition/installer/settings/files_main_install.nsh
index a79d4991..10afc6f6 100644
--- a/us_maker_edition/installer/settings/files_main_install.nsh
+++ b/us_maker_edition/installer/settings/files_main_install.nsh
@@ -33,19 +33,19 @@ CreateDirectory $INSTDIR\plugins
 CreateDirectory $INSTDIR\covers

 CreateDirectory $INSTDIR\songs

 

-${If} ${AtLeastWinVista}

+${If} $UseAppData == true

 

   ; Create folders in appdata for current user

   SetShellVarContext current		

-  CreateDirectory $APPDATA\ultrastardx

-  CreateDirectory $APPDATA\ultrastardx\screenshots

-  CreateDirectory $APPDATA\ultrastardx\playlists

+  CreateDirectory $UserDataPath

+  CreateDirectory $UserDataPath\screenshots

+  CreateDirectory $UserDataPath\playlists

 

   SetOutPath "$INSTDIR"

 

-  CreateShortCut "screenshots.lnk" "$APPDATA\ultrastardx\screenshots"

-  CreateShortCut "playlists.lnk" "$APPDATA\ultrastardx\playlists"

-  CreateShortCut "config.ini.lnk" "$APPDATA\ultrastardx\config.ini"

+  CreateShortCut "screenshots.lnk" "$UserDataPath\screenshots"

+  CreateShortCut "playlists.lnk" "$UserDataPath\playlists"

+  CreateShortCut "config.ini.lnk" "$ConfigIniPath"

 

   SetShellVarContext all

 ${EndIf}