Ignore:
Timestamp:
Apr 5, 2010, 4:11:45 AM (11 years ago)
Author:
iritscen
Message:

1/4: fixed superfluous BSL2.log
2/4: fixed slightly dubious package updating code
3/4: Mac AEI now trashes old pkgs instead of deleting them, after a pkg update
4/4: added AEI version check to update code so pkgs requiring newer AEI are skipped

File:
1 edited

Legend:

Unmodified
Added
Removed
  • AE/Installer/trunk/source/aeinstallerapp.cpp

    r504 r506  
    115115        if (updateStatus) // updateStatus was set when MainWindow::CreateControls() was called during initialization of the window
    116116        {
    117                 string updateMsg = "An update for the Anniversary Edition is available.\n"; // for some reason we can't set the initial value while using the '+' operator...
    118                 updateMsg = updateMsg + "Do you wish to update to Edition version " + updateAE.AEVersion + "?\n" +
    119                                                         "(Current version is " + currentAE.AEVersion + ")\n"; // ...so we tack the rest on in a second command
     117                string updateMsg = "An update for the Anniversary Edition is available.\n"
     118                                                   "Do you wish to update to Edition version " + updateAE.AEVersion + "?\n"
     119                                                   "(Current version is " + currentAE.AEVersion + ")\n"; // ...so we tack the rest on in a second command
    120120                wxMessageDialog* updateNotification;
    121121               
     
    140140                                        ProcessAEUpdate(&currentAE, &updateAE, &installerJustUpdated);
    141141                                break;
    142                         case UPDATE_THIRD_PARTY: // there's an update with no globalization or Installer strings attached
     142                        case UPDATE_PKG_AVAIL: // there's an update with no globalization or Installer strings attached
    143143                                updateMsg = (string)"One or more third party update(s) for Anniversary Edition package(s) are available.\n" +
    144144                                        (string)"Please note that the AE team assumes no responsibility for the content of third party mods" +
     
    147147                                updateNotification = new wxMessageDialog(TheWindow, updateMsg.c_str(), "AE Installer Alert", wxYES_NO | wxICON_EXCLAMATION, wxDefaultPosition);
    148148                                if (updateNotification->ShowModal() == wxID_YES)
    149                                         ProcessThirdPartyUpdates();     
     149                                        ProcessPackageUpdates("../updates", "./packages");
    150150                                break;
    151151                        case UPDATE_GLOB_AVAIL: // there's an update with globalization strings attached
Note: See TracChangeset for help on using the changeset viewer.