Changeset 49706 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 28, 2013 7:08:22 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 7007: Some native cocoa stuff should be async otherwise it prevents OS logoff/shutdown.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -23 +23 @@
 #include <QStackedWidget>
 #include <QToolButton>
+#ifdef Q_WS_MAC
+# include <QTimer>
+#endif /* Q_WS_MAC */
 
 /* GUI includes */
@@ -229 +232 @@
     m_pHeaderBtn->setIcon(Snap, UIIconPool::iconSet(":/snapshot_take_16px.png",
                                                     ":/snapshot_take_disabled_16px.png"));
-    m_pHeaderBtn->animateClick(0);
+#ifdef Q_WS_MAC
+    /* Cocoa stuff should be async...
+     * Do not ask me why but otherwise
+     * it conflicts with native handlers. */
+    QTimer::singleShot(0, this, SLOT(sltInit()));
+#else /* !Q_WS_MAC */
+    sltInit();
+#endif /* !Q_WS_MAC */
 
     /* Prepare main layout: */
@@ -326 +336 @@
 }
 
+void UIVMDesktop::sltInit()
+{
+    m_pHeaderBtn->animateClick(0);
+}
+
 void UIVMDesktop::retranslateUi()
 {

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.h

@@ -63 +63 @@
     void lockSnapshots();
 
+private slots:
+
+    /** Initialization handler. */
+    void sltInit();
+
 private: