--- AE/Installer/trunk/source/installer.cpp 2010/04/24 19:19:14 509 +++ AE/Installer/trunk/source/installer.cpp 2010/05/24 02:43:35 542 @@ -27,6 +27,7 @@ using namespace boost::posix_time; // externs declared in installer.h string strInstallCfg = "../GameDataFolder/Add.cfg"; string strEUFN = "Edition"; // GetUpdateStatus() may set this to "Edition-patch" later, but this is the assumed name of the new Edition folder in Updates/ +extern MainWindow* TheWindow; int globalizeData(void) { @@ -734,8 +735,10 @@ void copyBSL(string copypath, vectorpath(), "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename()); } } - BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon - BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ; + if( !pkg.hasAddon ) { + BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon + BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ; + } } } } @@ -841,8 +844,11 @@ int GetUpdateStatus(Install_info_cfg *cu return UPDATE_LOG_READ_ERR; } - // Is there an update folder, and is it a monthly release or a patch? + // Is there an update in the updates/ folder, and is it a monthly release or a patch? bool firstParty = 0; + // First create the folder if it's missing, so users are never left wondering where updates are supposed to be put + if (!exists("../updates")) + create_directory("../updates"); if (exists("../updates/Edition")) { firstParty = 1; @@ -975,8 +981,6 @@ int GetUpdateStatus(Install_info_cfg *cu ModPackage installedPackage, updatePackage; if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg")) { - string blah =install_iter->path().string() + "/Mod_Info.cfg"; - string blah2 = "packages/" + install_iter->path().filename() + "/Mod_Info.cfg"; fstream file; file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str()); if (!file.fail()) @@ -1488,11 +1492,11 @@ bool ProcessAEUpdate(Install_info_cfg *c CheckForGlobalization(true); // the 'true' value forces re-globalization globalPackages = getPackages(); // refresh the list in memory - // TODO: Refresh the packages list in the window - + wxCommandEvent e; + TheWindow->OnRefreshButtonClick( e ); return true; } -extern MainWindow* TheWindow; + void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages) { ptime startTime(second_clock::local_time());