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

Timestamp:

Aug 21, 2012 11:17:21 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Do not create network-manager indicator for VM-console process.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/net

Files:

• UINetworkManager.cpp (modified) (3 diffs)
• UINetworkRequest.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp

@@ -92 +92 @@
 
 UINetworkManager::UINetworkManager()
+    : m_pNetworkManagerDialog(0)
+    , m_pNetworkManagerIndicator(0)
 {
     /* Prepare instance: */
@@ -110 +112 @@
 
     /* Prepare network-manager state-indicator: */
-    m_pNetworkManagerIndicator = new UINetworkManagerIndicator;
-    connect(m_pNetworkManagerIndicator, SIGNAL(mouseDoubleClicked(QIStateIndicator *, QMouseEvent *)), this, SLOT(show()));
+    if (!vboxGlobal().isVMConsoleProcess())
+    {
+        m_pNetworkManagerIndicator = new UINetworkManagerIndicator;
+        connect(m_pNetworkManagerIndicator, SIGNAL(mouseDoubleClicked(QIStateIndicator *, QMouseEvent *)), this, SLOT(show()));
+    }
 }
 
@@ -120 +125 @@
 
     /* Cleanup network-manager state-indicator: */
-    delete m_pNetworkManagerIndicator;
+    if (!vboxGlobal().isVMConsoleProcess())
+    {
+        delete m_pNetworkManagerIndicator;
+        m_pNetworkManagerIndicator = 0;
+    }
 
     /* Cleanup network-manager dialog: */

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp

@@ -74 +74 @@
 
     /* Remove network-request description from network-manager state-indicator: */
-    m_pNetworkManagerIndicator->removeNetworkRequest(m_uuid);
+    if (m_pNetworkManagerIndicator)
+        m_pNetworkManagerIndicator->removeNetworkRequest(m_uuid);
 
     /* Remove network-request widget from network-manager dialog: */
@@ -185 +186 @@
 
     /* Create network-request description in network-manager state-indicator: */
-    m_pNetworkManagerIndicator->addNetworkRequest(this);
+    if (m_pNetworkManagerIndicator)
+        m_pNetworkManagerIndicator->addNetworkRequest(this);
 
     /* Choose first network-request as current: */