Ignore:
Timestamp:
Mar 15, 2010, 12:31:14 AM (11 years ago)
Author:
iritscen
Message:

Changed 'Installer replacement failed' message so user can choose not to quit.
Fixed BSL mod package-detecting bug and other dubious flag-detecting code.
Added check for required Installer version when scanning package info files.

File:
1 edited

Legend:

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

    r487 r500  
    1919////@end includes
    2020
     21extern int updateStatus;
     22extern bool installerJustUpdated;
    2123Install_info_cfg currentAE, updateAE;
    2224MainWindow* TheWindow;
     
    111113        }
    112114       
    113         bool installerJustUpdated = false;
    114         int updateStatus = GetUpdateStatus(&currentAE, &updateAE, &installerJustUpdated);
    115         if (updateStatus) // otherwise there's no update
     115        if (updateStatus) // updateStatus was set when MainWindow::CreateControls() was called during initialization of the window
    116116        {
    117117                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...
    118118                updateMsg = updateMsg + "Do you wish to update to Edition version " + updateAE.AEVersion + "?\n" +
    119                                                         "(Current version is " + currentAE.AEVersion + ")\n"; // ...so tack the rest on in a second command
     119                                                        "(Current version is " + currentAE.AEVersion + ")\n"; // ...so we tack the rest on in a second command
    120120                wxMessageDialog* updateNotification;
    121121               
     
    153153                                                                                "you will be prompted to begin the installation.";
    154154                                updateNotification = new wxMessageDialog(TheWindow, updateMsg.c_str(), "AE Installer Alert", wxYES_NO | wxICON_EXCLAMATION, wxDefaultPosition);
    155                                 updateNotification->ShowModal();
    156155                                if (updateNotification->ShowModal() == wxID_YES)
    157156                                {
     
    166165                        case UPDATE_INST_REPL_ERR: // the Installer replacement failed, user has to do it :-(
    167166                                updateMsg = "The Installer replacement process failed for some reason.\n";
    168                                 updateMsg = updateMsg + "Please quit, go into the folder Edition/Updates/" + strEUFN + "/install/ and drag the Installer to Edition/install/, " +
    169                                                                                 "replacing the current Installer application, then launch the new version.";
    170                                 updateNotification = new wxMessageDialog(TheWindow, updateMsg.c_str(), "AE Installer Alert", wxOK | wxICON_EXCLAMATION, wxDefaultPosition);
    171                                 updateNotification->ShowModal();
    172                                 TheWindow->Close();
     167                                updateMsg = updateMsg + "In order for the update to continue, go into the folder Edition/updates/" + strEUFN + "/install/ and " +
     168                                                                                "drag the Installer to Edition/install/, replacing the current Installer application, then launch the " +
     169                                                                                "new version. Click Yes to quit.";
     170                                updateNotification = new wxMessageDialog(TheWindow, updateMsg.c_str(), "AE Installer Alert", wxYES_NO | wxICON_EXCLAMATION, wxDefaultPosition);
     171                                if (updateNotification->ShowModal() == wxID_YES)
     172                                        TheWindow->Close();
    173173                                return true;
    174174                }
Note: See TracChangeset for help on using the changeset viewer.