--- AE/Installer/trunk/source/installer.cpp 2010/04/24 17:52:34 508 +++ AE/Installer/trunk/source/installer.cpp 2010/04/24 19:19:14 509 @@ -975,21 +975,24 @@ 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()) - ModPackage updatePackage = fileToModPackage(file, install_iter->path().filename()); + updatePackage = fileToModPackage(file, install_iter->path().filename()); else { file.close(); continue; } - if (exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg")) + if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg")) { file.close(); - file.open(("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str()); + file.clear(); + file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str()); if (!file.fail()) - ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename()); + installedPackage = fileToModPackage(file, install_iter->path().filename()); file.close(); if (updatePackage.modStringVersion > installedPackage.modStringVersion) { @@ -1489,7 +1492,7 @@ bool ProcessAEUpdate(Install_info_cfg *c return true; } - +extern MainWindow* TheWindow; void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages) { ptime startTime(second_clock::local_time()); @@ -1540,32 +1543,31 @@ void ProcessPackageUpdates(string pathTo if (!file.fail()) { installedPackage = fileToModPackage(file, updtFolder); - file.close(); - if (updatePackage.modStringVersion > installedPackage.modStringVersion) - { - if (updatePackage.installerVersion <= INSTALLER_VERSION) - { + } + file.close(); + } + file.close(); + if (updatePackage.modStringVersion > installedPackage.modStringVersion) + { + if (updatePackage.installerVersion <= INSTALLER_VERSION) + { + if(exists(strPathToPackages + "/" + updatePackage.modStringName)) { #ifdef WIN32 - remove_all((path)(strPathToPackages + "/" + installedPackage.modStringName)); + remove_all((path)(strPathToPackages + "/" + updatePackage.modStringName)); #else - if (needNewTrashDir) - { - strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast(tmStartTime.tm_hour) + "-" + - boost::lexical_cast(tmStartTime.tm_min) + "-" + boost::lexical_cast(tmStartTime.tm_sec) + "/"; - create_directory(strTrashDir); - needNewTrashDir = false; - } - rename((path)(strPathToPackages + "/" + installedPackage.modStringName), (path)(strTrashDir + installedPackage.modStringName)); -#endif - rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName)); + if (needNewTrashDir) + { + strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast(tmStartTime.tm_hour) + "-" + + boost::lexical_cast(tmStartTime.tm_min) + "-" + boost::lexical_cast(tmStartTime.tm_sec) + "/"; + create_directory(strTrashDir); + needNewTrashDir = false; } + rename((path)(strPathToPackages + "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName)); +#endif } + rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName)); } - else - file.close(); } - file.close(); - file.clear(); } } } @@ -1573,6 +1575,8 @@ void ProcessPackageUpdates(string pathTo { setStatusArea("Warning, handled exception: " + (string)ex.what()); } + wxCommandEvent e; + TheWindow->OnRefreshButtonClick( e ); } /* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an \