Changeset 102600 in vbox for trunk/src

Timestamp:

Dec 14, 2023 4:22:28 PM (17 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160754

Message:

FE/Qt: bugref:10543: UISession: Checking CPlatform for API errors as usual.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -69 +69 @@
 #include "CNATNetwork.h"
 #include "CNetworkAdapter.h"
+#include "CPlatform.h"
 #include "CPlatformProperties.h"
 #include "CRangedIntegerFormValue.h"
@@ -628 +629 @@
         UIErrorString::formatErrorInfo(comAppliance),
         QString(), QString(), pParent);
+}
+
+/* static */
+void UINotificationMessage::cannotAcquirePlatformParameter(const CPlatform &comPlatform)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Platform failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to acquire platform parameter.") +
+        UIErrorString::formatErrorInfo(comPlatform));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -286 +286 @@
         static void cannotAcquireApplianceParameter(const CAppliance &comAppliance,
                                                     UINotificationCenter *pParent = 0);
+        /** Notifies about inability to acquire IPlatform parameter.
+          * @param  comPlatform  Brings the object parameter get acquired from. */
+        static void cannotAcquirePlatformParameter(const CPlatform &comPlatform);
         /** Notifies about inability to acquire IPlatformProperties parameter.
           * @param  comProperties  Brings the object parameter get acquired from. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -306 +306 @@
         return false;
     CPlatform comPlatform = comMachine.GetPlatform();
-    const KPlatformArchitecture enmArchType = comPlatform.GetArchitecture();
-    const bool fSuccess = comMachine.isOk();
-    if (!fSuccess)
-        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
-    else
-        enmType = enmArchType;
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        const KPlatformArchitecture enmArchType = comPlatform.GetArchitecture();
+        fSuccess = comPlatform.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquirePlatformParameter(comPlatform);
+        else
+            enmType = enmArchType;
+    }
     return fSuccess;
 }
@@ -321 +327 @@
         return false;
     CPlatform comPlatform = comMachine.GetPlatform();
-    const KChipsetType enmChipsetType = comPlatform.GetChipsetType();
-    const bool fSuccess = comMachine.isOk();
-    if (!fSuccess)
-        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
-    else
-        enmType = enmChipsetType;
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        const KChipsetType enmChipsetType = comPlatform.GetChipsetType();
+        fSuccess = comPlatform.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquirePlatformParameter(comPlatform);
+        else
+            enmType = enmChipsetType;
+    }
     return fSuccess;
 }