--- AE/Installer/trunk/source/main_window.cpp	2009/07/06 23:53:24	400
+++ AE/Installer/trunk/source/main_window.cpp	2009/07/07 12:48:37	409
@@ -357,8 +357,10 @@ int globalizeData(void)
 		copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
 		setProgressBar( 1000 );
 
-		copy("../../persist.dat","..");
-		copy("../../key_config.txt",".."); 
+		if(!exists("../persist.dat"))
+			copy("../../persist.dat","..");
+		if(!exists("../key_config.txt"))
+			copy("../../key_config.txt",".."); 
 		
 #ifndef WIN32
 		/* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
@@ -1139,19 +1141,27 @@ void MainWindow::CreateControls()
     // Connect events and objects
     Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
 	////@end MainWindow content construction
-
+#ifdef WIN32
 	Handle = (HWND)GetHWND();
 	::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
+#endif
 
-
-	if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
+	/*if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
 		strImportOption = "-import:sep";
 		splitInstances = NOT_SPLIT;
 	}
 	else {
 		strImportOption = "-import:nosep";
 		splitInstances = SPLIT;
-	}
+	}*/
+	
+#ifndef WIN32
+	strImportOption = "-import:sep";
+	splitInstances = NOT_SPLIT;
+#else
+	strImportOption = "-import:nosep";
+	splitInstances = SPLIT;
+#endif
 	
 	globalPackages = getPackages();
 	globalInstalledMods = getInstallString();