Changeset 24080 in vbox for trunk/src/VBox

Timestamp:

Oct 26, 2009 2:42:01 PM (15 years ago)

Author:

vboxsync

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

53956

Message:

FE/Qt4: VBox Console WND: Fixed regression provoking dvd-led to be not grayed-out when there are no any dvd mediums attached.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -2668 +2668 @@
                     .arg (vboxGlobal().toString (StorageSlot (controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
                     .arg (vboxMedium.isNull() || vboxMedium.isHostDrive() ? vboxMedium.name() : vboxMedium.location());
-                attachmentsPresent = true;
+                if (!vboxMedium.isNull())
+                    attachmentsPresent = true;
             }
             if (!attData.isNull())
@@ -2674 +2675 @@
         }
 
-        if (!attachmentsPresent)
-            data += tr ("<br><nobr><b>No CD/DVD devices attached</b></nobr>", "CD/DVD tooltip");
+        if (data.isNull())
+            data = tr ("<br><nobr><b>No CD/DVD devices attached</b></nobr>", "CD/DVD tooltip");
 
         mCDLed->setToolTip (tip.arg (data));
@@ -2702 +2703 @@
                     .arg (vboxGlobal().toString (StorageSlot (controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
                     .arg (vboxMedium.isNull() || vboxMedium.isHostDrive() ? vboxMedium.name() : vboxMedium.location());
-                attachmentsPresent = true;
+                if (!vboxMedium.isNull())
+                    attachmentsPresent = true;
             }
             if (!attData.isNull())
@@ -2708 +2710 @@
         }
 
-        if (!attachmentsPresent)
-            data += tr ("<br><nobr><b>No floppy devices attached</b></nobr>", "FD tooltip");
+        if (data.isNull())
+            data = tr ("<br><nobr><b>No floppy devices attached</b></nobr>", "FD tooltip");
 
         mFDLed->setToolTip (tip.arg (data));