From d6cf58a5e4288d3796cbd0a6a7071a4c036616bb Mon Sep 17 00:00:00 2001
From: canni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 18 Apr 2009 15:29:30 +0000
Subject: - fixed assembla ticket #49 - fixed uninstall routine (forgot to
 delete cached covers)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1681 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 installer/settings/files_main_install.nsh   | 12 ++++++------
 installer/settings/files_main_uninstall.nsh |  1 +
 src/base/UIni.pas                           |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh
index 6a270257..c2cdf727 100644
--- a/installer/settings/files_main_install.nsh
+++ b/installer/settings/files_main_install.nsh
@@ -4,10 +4,11 @@
 
 ; Create Directories:
 
-CreateDirectory $INSTDIR\plugins
-CreateDirectory $INSTDIR\songs
-CreateDirectory $INSTDIR\screenshots
-CreateDirectory $INSTDIR\playlists
+CreateDirectory $INSTDIR\Plugins
+CreateDirectory $INSTDIR\Songs
+CreateDirectory $INSTDIR\Screenshots
+CreateDirectory $INSTDIR\Playlists
+CreateDirectory $INSTDIR\Covers
 
 SetOutPath "$INSTDIR"
 
@@ -23,7 +24,6 @@ File /r ..\installerdependencies\visuals
 
 File ..\installerdependencies\dll\*.dll
 
-
 File ..\ChangeLog.txt
 File ..\ChangeLog.german.txt
 File ..\README.txt
@@ -35,7 +35,7 @@ File "..\${exe}.exe"
 
 ; Covers dir:
 
-SetOutPath "$INSTDIR\covers"
+SetOutPath "$INSTDIR\Covers"
 
 IfFileExists $INSTDIR\covers\covers.ini +2 0
 File ..\game\covers\Covers.ini
diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh
index 277eb409..af61cb0b 100644
--- a/installer/settings/files_main_uninstall.nsh
+++ b/installer/settings/files_main_uninstall.nsh
@@ -35,6 +35,7 @@
  Delete "$INSTDIR\README.txt"
  Delete "$INSTDIR\Error.log"
  Delete "$INSTDIR\covers.cache"
+ Delete "$INSTDIR\cover.db"
 
  Delete "$INSTDIR\avcodec-51.dll"
  Delete "$INSTDIR\avformat-50.dll"
diff --git a/src/base/UIni.pas b/src/base/UIni.pas
index 1d07f5bc..2c1029f6 100644
--- a/src/base/UIni.pas
+++ b/src/base/UIni.pas
@@ -708,16 +708,16 @@ begin
   PreviewVolume := GetArrayIndex(IPreviewVolume, IniFile.ReadString('Sound', 'PreviewVolume', IPreviewVolume[7]));
 
   //Preview Fading
-  PreviewFading := GetArrayIndex(IPreviewFading, IniFile.ReadString('Sound', 'PreviewFading', IPreviewFading[1]));
+  PreviewFading := GetArrayIndex(IPreviewFading, IniFile.ReadString('Sound', 'PreviewFading', IPreviewFading[3]));
 
   //AudioRepeat aka VoicePassthrough
   VoicePassthrough := GetArrayIndex(IVoicePassthrough, IniFile.ReadString('Sound', 'VoicePassthrough', IVoicePassthrough[0]));
 
   // Lyrics Font
-  LyricsFont := GetArrayIndex(ILyricsFont, IniFile.ReadString('Lyrics', 'LyricsFont', ILyricsFont[1]));
+  LyricsFont := GetArrayIndex(ILyricsFont, IniFile.ReadString('Lyrics', 'LyricsFont', ILyricsFont[0]));
 
   // Lyrics Effect
-  LyricsEffect := GetArrayIndex(ILyricsEffect, IniFile.ReadString('Lyrics', 'LyricsEffect', ILyricsEffect[1]));
+  LyricsEffect := GetArrayIndex(ILyricsEffect, IniFile.ReadString('Lyrics', 'LyricsEffect', ILyricsEffect[2]));
 
   // Solmization
   Solmization := GetArrayIndex(ISolmization, IniFile.ReadString('Lyrics', 'Solmization', ISolmization[0]));
-- 
cgit v1.2.3