Changeset 5796 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2007 5:06:03 PM (17 years ago)

Author:

vboxsync

Message:

2491: "Serial Port UI may produce invalid XML" fixed (allowing empty Port Path only for Port Mode == Disconnected in case of both enabled

disabled port).

File:

• trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -1515 +1515 @@
                 static_cast <VBoxVMSerialPortSettings *> (tab);
 
-            /* skip disabled ports */
-            if (!page->mSerialPortBox->isChecked())
-                continue;
             /* check the predefined port number unicity */
-            if (!page->isUserDefined())
+            if (page->mSerialPortBox->isChecked() && !page->isUserDefined())
             {
                 QString port = page->mPortNumCombo->currentText();
@@ -1531 +1528 @@
                 ports << port;
             }
-            /* check the port path unicity */
+            /* check the port path emptiness & unicity */
             CEnums::PortMode mode =
                 vboxGlobal().toPortMode (page->mHostModeCombo->currentText());
@@ -1537 +1534 @@
             {
                 QString path = page->mPortPathLine->text();
-                valid = !paths.contains (path);
+                valid = !path.isEmpty() && !paths.contains (path);
                 if (!valid)
                 {
-                    warningText = tr ("Duplicate port path is entered ");
+                    warningText = path.isEmpty() ?
+                        tr ("Port path is not entered ") :
+                        tr ("Duplicate port path is entered ");
                     pageTitle += ": " + tbwSerialPorts->tabLabel (tab);
                     break;