VirtualBox

Changeset 90662 in vbox for trunk


Ignore:
Timestamp:
Aug 12, 2021 1:32:17 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10067: UIMachineLogic: Cleanup for guest additions lookup code.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r90645 r90662  
    24952495        return;
    24962496
    2497     CSystemProperties systemProperties = uiCommon().virtualBox().GetSystemProperties();
    2498     QString strAdditions = systemProperties.GetDefaultAdditionsISO();
    2499     if (systemProperties.isOk() && !strAdditions.isEmpty())
     2497    /* Try to acquire default additions ISO: */
     2498    CSystemProperties comSystemProperties = uiCommon().virtualBox().GetSystemProperties();
     2499    const QString strAdditions = comSystemProperties.GetDefaultAdditionsISO();
     2500    if (comSystemProperties.isOk() && !strAdditions.isEmpty())
    25002501        return uisession()->sltInstallGuestAdditionsFrom(strAdditions);
    25012502
    2502     /* Check for the already registered image */
    2503     CVirtualBox vbox = uiCommon().virtualBox();
    2504     const QString &strName = QString("%1_%2.iso").arg(GUI_GuestAdditionsName, uiCommon().vboxVersionStringNormalized());
    2505 
    2506     CMediumVector vec = vbox.GetDVDImages();
    2507     for (CMediumVector::ConstIterator it = vec.begin(); it != vec.end(); ++ it)
    2508     {
    2509         QString path = it->GetLocation();
    2510         /* Compare the name part ignoring the file case */
    2511         QString fn = QFileInfo(path).fileName();
    2512         if (RTPathCompare(strName.toUtf8().constData(), fn.toUtf8().constData()) == 0)
    2513             return uisession()->sltInstallGuestAdditionsFrom(path);
     2503    /* Check whether we have already registered image: */
     2504    CVirtualBox comVBox = uiCommon().virtualBox();
     2505    CMediumVector comMedia = comVBox.GetDVDImages();
     2506    if (!comVBox.isOk())
     2507        msgCenter().cannotAcquireVirtualBoxParameter(comVBox);
     2508    else
     2509    {
     2510        const QString strName = QString("%1_%2.iso").arg(GUI_GuestAdditionsName, uiCommon().vboxVersionStringNormalized());
     2511        foreach (const CMedium &comMedium, comMedia)
     2512        {
     2513            /* Compare the name part ignoring the file case: */
     2514            const QString strPath = comMedium.GetLocation();
     2515            if (!comMedium.isOk())
     2516                msgCenter().cannotAcquireMediumAttribute(comMedium);
     2517            {
     2518                const QString strFileName = QFileInfo(strPath).fileName();
     2519                if (RTPathCompare(strName.toUtf8().constData(), strFileName.toUtf8().constData()) == 0)
     2520                    return uisession()->sltInstallGuestAdditionsFrom(strPath);
     2521            }
     2522        }
    25142523    }
    25152524
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette