--- AE/Installer/trunk/source/installer.cpp	2010/05/26 23:04:56	549
+++ AE/Installer/trunk/source/installer.cpp	2010/05/26 23:28:22	550
@@ -1384,13 +1384,13 @@ bool ProcessAEUpdate(Install_info_cfg *c
 	// Special code to replace our special files -- the Oni app, OniSplit, the Daodan DLL, and the GUI for OniSplit
 	if (exists(strPathToEUFN + strOniApp))
 	{
-		if (exists(strOniApp))
+		if (exists("../" + strOniApp))
 #ifdef WIN32
-			remove((path)strOniApp);
+			remove((path)("../" + strOniApp));
 #else
-			rename((path)strOniApp, (path)(strTrashDir + strOniApp));
+			rename((path)("../" + strOniApp), (path)(strTrashDir + strOniApp));
 #endif
-		rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
+		rename((path)(strPathToEUFN + strOniApp), (path)("../" + strOniApp));
 	}
 	if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
 	{
@@ -1513,7 +1513,7 @@ bool ProcessAEUpdate(Install_info_cfg *c
 	
 	// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
 #ifdef WIN32
-	remove((path)strPathToEUFN);
+	remove_all((path)strPathToEUFN);
 #else
 	create_directory(strTrashDir + "Unneeded update files");
 	rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));