Changeset 96139 in vbox

Timestamp:

Aug 11, 2022 2:47:34 PM (3 years ago)

Author:

vboxsync

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

152944

Message:

Recording/FE/Qt: Make use of better error propagation (via r152942). Also, don't (debug) assert when an error occurred, as this now is the job of the now being received error info. ​bugref:10275

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (3 diffs)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (17 diffs)

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

@@ -55 +55 @@
 #include "CNetworkAdapter.h"
 #include "CRangedIntegerFormValue.h"
+#include "CRecordingSettings.h"
 #include "CStringFormValue.h"
 #ifdef VBOX_WITH_UPDATE_AGENT
@@ -1554 +1555 @@
 
 /* static */
-void UINotificationMessage::cannotToggleRecording(const CMachine &comMachine, bool fEnable)
-{
-    const QString strMachineName(CMachine(comMachine).GetName());
+void UINotificationMessage::cannotToggleRecording(const CRecordingSettings &comRecording, const QString &strMachineName, bool fEnable)
+{
     createMessage(
         QApplication::translate("UIMessageCenter", "Can't toggle recording ..."),
@@ -1564 +1564 @@
          : QApplication::translate("UIMessageCenter", "Failed to disable recording for the virtual machine <b>%1</b>.")
                                    .arg(strMachineName)) +
-        UIErrorString::formatErrorInfo(comMachine));
+        UIErrorString::formatErrorInfo(comRecording));
 }
 

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

@@ -616 +616 @@
 
         /** Notifies about inability to toggle recording.
-          * @param  comMachine  Brings the machine recording being toggled for.
-          * @param  fEnable     Brings whether recording is enabled or not. */
-        static void cannotToggleRecording(const CMachine &comMachine, bool fEnable);
+          * @param  comRecording    Brings the recording settings being toggled for.
+          * @param  strMachineName  Brings the machine name.
+          * @param  fEnable         Brings whether recording is enabled or not. */
+        static void cannotToggleRecording(const CRecordingSettings &comRecording, const QString &strMachineName, bool fEnable);
 
         /** Notifies about inability to toggle VRDE server.

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

@@ -2086 +2086 @@
         uisession()->updateStatusRecording();
         /* Notify about the error: */
-        return UINotificationMessage::cannotToggleRecording(machine(), fEnabled);
+        return UINotificationMessage::cannotToggleRecording(comRecordingSettings, machine().GetName(), fEnabled);
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -1231 +1231 @@
                 {
                     comRecordingScreenSettings.SetFilename(newDisplayData.m_strRecordingFilePath);
-                    Assert(comRecordingScreenSettings.isOk());
                     fSuccess = comRecordingScreenSettings.isOk();
                 }
@@ -1238 +1237 @@
                 {
                     comRecordingScreenSettings.SetVideoWidth(newDisplayData.m_iRecordingVideoFrameWidth);
-                    Assert(comRecordingScreenSettings.isOk());
                     fSuccess = comRecordingScreenSettings.isOk();
                 }
@@ -1245 +1243 @@
                 {
                     comRecordingScreenSettings.SetVideoHeight(newDisplayData.m_iRecordingVideoFrameHeight);
-                    Assert(comRecordingScreenSettings.isOk());
                     fSuccess = comRecordingScreenSettings.isOk();
                 }
@@ -1252 +1249 @@
                 {
                     comRecordingScreenSettings.SetVideoFPS(newDisplayData.m_iRecordingVideoFrameRate);
-                    Assert(comRecordingScreenSettings.isOk());
                     fSuccess = comRecordingScreenSettings.isOk();
                 }
@@ -1259 +1255 @@
                 {
                     comRecordingScreenSettings.SetVideoRate(newDisplayData.m_iRecordingVideoBitRate);
-                    Assert(comRecordingScreenSettings.isOk());
                     fSuccess = comRecordingScreenSettings.isOk();
                 }
@@ -1266 +1261 @@
                 {
                     comRecordingScreenSettings.SetOptions(newDisplayData.m_strRecordingVideoOptions);
-                    Assert(comRecordingScreenSettings.isOk());
                     fSuccess = comRecordingScreenSettings.isOk();
                 }
@@ -1274 +1268 @@
                 {
                     comRecordingScreenSettings.SetEnabled(newDisplayData.m_vecRecordingScreens[iScreenIndex]);
-                    Assert(comRecordingScreenSettings.isOk());
                     fSuccess = comRecordingScreenSettings.isOk();
+                }
+
+                if (!fSuccess)
+                {
+                    if (!comRecordingScreenSettings.isOk())
+                        notifyOperationProgressError(UIErrorString::formatErrorInfo(comRecordingScreenSettings));
+                    break; /* No point trying to handle the other screens (if any). */
                 }
             }
@@ -1284 +1284 @@
             {
                 recordingSettings.SetEnabled(newDisplayData.m_fRecordingEnabled);
-                Assert(recordingSettings.isOk());
                 fSuccess = recordingSettings.isOk();
             }
@@ -1301 +1300 @@
             {
                 comRecordingScreenSettings.SetFilename(newDisplayData.m_strRecordingFilePath);
-                Assert(comRecordingScreenSettings.isOk());
                 fSuccess = comRecordingScreenSettings.isOk();
             }
@@ -1308 +1306 @@
             {
                 comRecordingScreenSettings.SetVideoWidth(newDisplayData.m_iRecordingVideoFrameWidth);
-                Assert(comRecordingScreenSettings.isOk());
                 fSuccess = comRecordingScreenSettings.isOk();
             }
@@ -1315 +1312 @@
             {
                 comRecordingScreenSettings.SetVideoHeight(newDisplayData.m_iRecordingVideoFrameHeight);
-                Assert(comRecordingScreenSettings.isOk());
                 fSuccess = comRecordingScreenSettings.isOk();
             }
@@ -1322 +1318 @@
             {
                 comRecordingScreenSettings.SetVideoFPS(newDisplayData.m_iRecordingVideoFrameRate);
-                Assert(comRecordingScreenSettings.isOk());
                 fSuccess = comRecordingScreenSettings.isOk();
             }
@@ -1329 +1324 @@
             {
                 comRecordingScreenSettings.SetVideoRate(newDisplayData.m_iRecordingVideoBitRate);
-                Assert(comRecordingScreenSettings.isOk());
                 fSuccess = comRecordingScreenSettings.isOk();
             }
@@ -1336 +1330 @@
             {
                 comRecordingScreenSettings.SetOptions(newDisplayData.m_strRecordingVideoOptions);
-                Assert(comRecordingScreenSettings.isOk());
                 fSuccess = comRecordingScreenSettings.isOk();
             }
@@ -1344 +1337 @@
             {
                 comRecordingScreenSettings.SetEnabled(newDisplayData.m_vecRecordingScreens[iScreenIndex]);
-                Assert(comRecordingScreenSettings.isOk());
                 fSuccess = comRecordingScreenSettings.isOk();
+            }
+
+            if (!fSuccess)
+            {
+                notifyOperationProgressError(UIErrorString::formatErrorInfo(comRecordingScreenSettings));
+                break; /* No point trying to handle the other screens (if any). */
             }
         }
@@ -1354 +1352 @@
         {
             recordingSettings.SetEnabled(newDisplayData.m_fRecordingEnabled);
-            Assert(recordingSettings.isOk());
             fSuccess = recordingSettings.isOk();
         }
@@ -1361 +1358 @@
     /* Show error message if necessary: */
     if (!fSuccess)
-        notifyOperationProgressError(UIErrorString::formatErrorInfo(m_machine));
+    {
+        if (!recordingSettings.isOk())
+            notifyOperationProgressError(UIErrorString::formatErrorInfo(recordingSettings));
+        else if (!m_machine.isOk()) /* Machine could indicate an error when saving the settings. */
+            notifyOperationProgressError(UIErrorString::formatErrorInfo(m_machine));
+    }
 
     /* Return result: */