Changeset 50924 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 28, 2014 7:21:17 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 7329: Trying to fix the crash in machine-preview paint event: Caching VM accessibility status outside the paint-event.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details

Files:

• UIGMachinePreview.cpp (modified) (3 diffs)
• UIGMachinePreview.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

@@ -112 +112 @@
 void UIGMachinePreview::setMachine(const CMachine& machine)
 {
+    /* Pause: */
     stop();
+
+    /* Assign new machine: */
     m_machine = machine;
+
+    /* Fetch machine data: */
+    m_strPreviewName = tr("No preview");
+    if (!m_machine.isNull())
+        m_strPreviewName = m_machine.GetAccessible() ? m_machine.GetName() :
+                           QApplication::translate("UIVMListView", "Inaccessible");
+
+    /* Resume: */
     restart();
 }
@@ -299 +310 @@
         pPainter->drawPixmap(cr.x() + m_iMargin, cr.y() + m_iMargin, *m_pbgFullImage);
 
-        /* Compose name: */
-        QString strName = tr("No preview");
-        if (!m_machine.isNull())
-            strName = m_machine.GetAccessible() ? m_machine.GetName() :
-                      QApplication::translate("UIVMListView", "Inaccessible");
-        /* Paint that name: */
+        /* Paint preview name: */
         QFont font = pPainter->font();
         font.setBold(true);
@@ -318 +324 @@
             font.setPixelSize((int)h);
             pPainter->setFont(font);
-            r = pPainter->boundingRect(m_vRect, fFlags, strName);
+            r = pPainter->boundingRect(m_vRect, fFlags, m_strPreviewName);
         }
         while ((r.height() > m_vRect.height() || r.width() > m_vRect.width()) && cMax-- != 0);
         pPainter->setPen(Qt::white);
-        pPainter->drawText(m_vRect, fFlags, strName);
+        pPainter->drawText(m_vRect, fFlags, m_strPreviewName);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h

@@ -113 +113 @@
     QPixmap *m_pbgFullImage;
     QImage *m_pPreviewImg;
+    QString m_strPreviewName;
     static UpdateIntervalMap m_intervals;
 };