Changeset 107475 in vbox

Timestamp:

Jan 8, 2025 4:54:47 AM (2 months ago)

Author:

vboxsync

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

166533

Message:

FE/Qt: bugref:3409: VM Settings / USB page: Fix for similar parfait warnings related to redundant condition.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (modified) (7 diffs)

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

@@ -377 +377 @@
     bool fSuccess = true;
     /* Save USB settings from cache: */
-    if (fSuccess && isMachineInValidMode() && m_pCache->wasChanged())
+    if (/*fSuccess &&*/ isMachineInValidMode() && m_pCache->wasChanged())
     {
         /* Get new USB data from cache: */
@@ -383 +383 @@
 
         /* Save USB data: */
-        if (fSuccess && isMachineOffline())
+        if (/*fSuccess &&*/ isMachineOffline())
         {
             /* Remove USB controllers: */
             if (!newUsbData.m_fUSBEnabled)
                 fSuccess = removeUSBControllers();
-
+            /* Create/update USB controllers: */
             else
-
-            /* Create/update USB controllers: */
-            if (newUsbData.m_fUSBEnabled)
                 fSuccess = createUSBControllers(newUsbData.m_enmUSBControllerType);
         }
@@ -416 +413 @@
 
                     /* Remove filter marked for 'remove' or 'update': */
-                    if (fSuccess && (filterCache.wasRemoved() || filterCache.wasUpdated()))
-                    {
+                    if (/*fSuccess &&*/ (filterCache.wasRemoved() || filterCache.wasUpdated()))
                         fSuccess = removeUSBFilter(comFiltersObject, iOperationPosition);
-                        if (fSuccess && filterCache.wasRemoved())
-                            --iOperationPosition;
-                    }
+
+                    /* Decrease operation position for removed filter: */
+                    if (fSuccess && filterCache.wasRemoved())
+                        --iOperationPosition;
 
                     /* Create filter marked for 'create' or 'update': */
@@ -460 +457 @@
             /* Get controller type for further activities: */
             KUSBControllerType enmType = KUSBControllerType_Null;
-            if (fSuccess)
+            // if (fSuccess)
             {
                 enmType = comController.GetType();
@@ -483 +480 @@
 
                 /* Remove controller: */
-                if (fSuccess)
+                // if (fSuccess)
                 {
                     m_machine.RemoveUSBController(comController.GetName());
@@ -565 +562 @@
                     if (fSuccess)
                     {
-                        if (fSuccess && !cOhciCtls)
+                        if (/*fSuccess &&*/ !cOhciCtls)
                         {
                             m_machine.AddUSBController("OHCI", KUSBControllerType_OHCI);
@@ -649 +646 @@
         {
             /* Save whether filter is active: */
-            if (fSuccess)
+            // if (fSuccess)
             {
                 comFilter.SetActive(filterData.m_guiData.m_fActive);