Changeset 42256 in vbox

Timestamp:

Jul 20, 2012 12:08:44 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings / Network page: Early notify about MAC address field errors.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp (modified) (2 diffs)

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

@@ -217 +217 @@
     }
 
-    /* Validate MAC-address: */
+    /* Validate MAC-address length: */
     if (m_pMACEditor->text().size() < 12)
     {
@@ -223 +223 @@
         fValid = false;
     }
-    else
-    {
-        QRegExp validator("[0-9A-Fa-f][02468ACEace][0-9A-Fa-f]{10}");
-        if (!validator.exactMatch(m_pMACEditor->text()))
-        {
-            strWarning = tr("the second digit cannot be odd, as only unicast MAC addresses allowed.");
+    /* Make sure MAC-address is unicast: */
+    if (m_pMACEditor->text().size() >= 2)
+    {
+        QRegExp validator("^[0-9A-Fa-f][02468ACEace]");
+        if (validator.indexIn(m_pMACEditor->text()) != 0)
+        {
+            strWarning = tr("the second digit in the MAC Address field cannot be odd, "
+                            "as only unicast addresses are allowed.");
             fValid = false;
         }