From 496ee722ce43b4666349abb8f7d34df4ac01592f Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 4 Jul 2011 17:58:45 +0000
Subject: [PATCH] Fix pending error messing up the file-append op

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3630 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/build/win32_install/uqm-installer.nsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sc2/build/win32_install/uqm-installer.nsi b/sc2/build/win32_install/uqm-installer.nsi
index 35907d528..c8b5a4a92 100644
--- a/sc2/build/win32_install/uqm-installer.nsi
+++ b/sc2/build/win32_install/uqm-installer.nsi
@@ -344,9 +344,12 @@ done:
 FunctionEnd
 
 Function EnableRemixes
+  # If there are errors pending AppendToFile will fail
+  ClearErrors
   Push "$UQMUSERDATA\uqm.cfg"
   Push "remixmusic = BOOLEAN:true$\r$\n"
   Call AppendToFile
+  ClearErrors
 FunctionEnd
 
 SectionGroup "!UQM" SECGRP01
@@ -625,6 +628,7 @@ Section Uninstall
   Delete "$INSTDIR\SDL_image.dll"
   Delete "$INSTDIR\SDL.dll"
   Delete "$INSTDIR\README.txt"
+  Delete "$INSTDIR\README-SDL.txt"
   Delete "$INSTDIR\wrap_oal.dll"
   Delete "$INSTDIR\OpenAL32.dll"
   Delete "$INSTDIR\ogg.dll"