Changeset 66256 in vbox

Timestamp:

Mar 27, 2017 9:21:39 AM (8 years ago)

Author:

vboxsync

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

114177

Message:

FE/Qt: bugref:8783: Move the native filter cleanup call to corresponding place, right before the machine-view destruction, preventing crash in certain conditions; Adjust corresponding source code location as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (4 diffs)
• UIMachineView.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -246 +246 @@
         return;
 
-    /* Cleanup filters: */
-    pMachineView->cleanupFilters();
-
     /* Cleanup frame-buffer: */
     pMachineView->cleanupFrameBuffer();
@@ -259 +256 @@
     }
 #endif
+
+    /* Cleanup native filters: */
+    pMachineView->cleanupNativeFilters();
+
     delete pMachineView;
 }
@@ -862 +863 @@
 }
 
-void UIMachineView::cleanupFilters()
-{
-#if QT_VERSION >= 0x050000
-    /* If native event filter exists: */
-    if (m_pNativeEventFilter)
-    {
-        /* Uninstall/destroy existing native event filter: */
-        qApp->removeNativeEventFilter(m_pNativeEventFilter);
-        delete m_pNativeEventFilter;
-        m_pNativeEventFilter = 0;
-    }
-#endif
-}
-
 void UIMachineView::cleanupFrameBuffer()
 {
@@ -903 +890 @@
     /* Detach framebuffer from view: */
     m_pFrameBuffer->setView(NULL);
+}
+
+void UIMachineView::cleanupNativeFilters()
+{
+#if QT_VERSION >= 0x050000
+    /* If native event filter exists: */
+    if (m_pNativeEventFilter)
+    {
+        /* Uninstall/destroy existing native event filter: */
+        qApp->removeNativeEventFilter(m_pNativeEventFilter);
+        delete m_pNativeEventFilter;
+        m_pNativeEventFilter = 0;
+    }
+#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -179 +179 @@
     /* Prepare routines: */
     virtual void loadMachineViewSettings();
+    //virtual void prepareNativeFilters() {}
     virtual void prepareViewport();
     virtual void prepareFrameBuffer();
@@ -189 +190 @@
     //virtual void cleanupConsoleConnections() {}
     //virtual void cleanupConnections() {}
-    virtual void cleanupFilters();
+    //virtual void cleanupFilters() {}
     //virtual void cleanupCommon() {}
     virtual void cleanupFrameBuffer();
     //virtual void cleanupViewport();
+    virtual void cleanupNativeFilters();
     //virtual void saveMachineViewSettings() {}