Changeset 33638 in vbox

Timestamp:

Nov 1, 2010 8:10:29 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Exclude 2D/3D test procedures from cache as they are not safe for non-GUI thread.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm

Files:

• VBoxVMSettingsDisplay.cpp (modified) (2 diffs)
• VBoxVMSettingsDisplay.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.cpp

@@ -148 +148 @@
     m_cache.m_iCurrentVRAM = m_machine.GetVRAMSize();
     m_cache.m_cMonitorCount = m_machine.GetMonitorCount();
-    m_cache.m_f3dAccelerationSupported = vboxGlobal().virtualBox().GetHost().GetAcceleration3DAvailable();
     m_cache.m_f3dAccelerationEnabled = m_machine.GetAccelerate3DEnabled();
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    m_cache.m_f2dAccelerationSupported = VBoxGlobal::isAcceleration2DVideoAvailable();
     m_cache.m_f2dAccelerationEnabled = m_machine.GetAccelerate2DVideoEnabled();
 #endif
@@ -175 +173 @@
     /* Apply internal variables data to QWidget(s): */
     mSlMonitors->setValue(m_cache.m_cMonitorCount);
-    mCb3D->setEnabled(m_cache.m_f3dAccelerationSupported);
+    mCb3D->setEnabled(vboxGlobal().virtualBox().GetHost().GetAcceleration3DAvailable());
     mCb3D->setChecked(m_cache.m_f3dAccelerationEnabled);
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    mCb2DVideo->setEnabled(m_cache.m_f2dAccelerationSupported);
+    mCb2DVideo->setEnabled(VBoxGlobal::isAcceleration2DVideoAvailable());
     mCb2DVideo->setChecked(m_cache.m_f2dAccelerationEnabled);
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.h

@@ -29 +29 @@
     int m_iCurrentVRAM;
     int m_cMonitorCount;
-    bool m_f3dAccelerationSupported;
     bool m_f3dAccelerationEnabled;
-    bool m_f2dAccelerationSupported;
     bool m_f2dAccelerationEnabled;
     bool m_fVRDEServerSupported;