Changeset 4363 in vbox

Timestamp:

Aug 24, 2007 5:40:44 PM (17 years ago)

Author:

vboxsync

Message:

Do not call the VRDP server when it is being terminated.

File:

• trunk/src/VBox/Main/ConsoleVRDPServer.cpp (modified) (14 diffs)

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -1024 +1024 @@
 {
 #ifdef VBOX_VRDP
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPEnableConnections (mhServer, true);
@@ -1034 +1034 @@
 {
 #ifdef VBOX_VRDP
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPColorPointer (mhServer, pPointer);
@@ -1044 +1044 @@
 {
 #ifdef VBOX_VRDP
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPHidePointer (mhServer);
@@ -1076 +1076 @@
 
 #ifdef VRDP_NO_COM
-        if (mpEntryPoints)
+        if (mpEntryPoints && hServer)
         {
             mpEntryPoints->VRDPDestroy (hServer);
@@ -1426 +1426 @@
             /* The guest announces clipboard formats. This must be delivered to all clients. */
 #ifdef VRDP_NO_COM
-            if (mpEntryPoints)
+            if (mpEntryPoints && pServer->mhServer)
             {
                 mpEntryPoints->VRDPClipboard (pServer->mhServer, 
@@ -1455 +1455 @@
              */
 #ifdef VRDP_NO_COM
-            if (mpEntryPoints)
+            if (mpEntryPoints && pServer->mhServer)
             {
                 mpEntryPoints->VRDPClipboard (pServer->mhServer, 
@@ -1480 +1480 @@
         {
 #ifdef VRDP_NO_COM
-            if (mpEntryPoints)
+            if (mpEntryPoints && pServer->mhServer)
             {
                 mpEntryPoints->VRDPClipboard (pServer->mhServer, 
@@ -1824 +1824 @@
 #ifdef VBOX_VRDP
 #ifdef VRDP_NO_COM
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPUpdate (mhServer, uScreenId, pvUpdate, cbUpdate);
@@ -1839 +1839 @@
 #ifdef VBOX_VRDP
 #ifdef VRDP_NO_COM
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPResize (mhServer);
@@ -1859 +1859 @@
     update.w = w;
     update.h = h;
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPUpdate (mhServer, uScreenId, &update, sizeof (update));
@@ -1885 +1885 @@
 #ifdef VBOX_VRDP
 #ifdef VRDP_NO_COM
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPAudioSamples (mhServer, pvSamples, cSamples, format);
@@ -1900 +1900 @@
 #ifdef VBOX_VRDP
 #ifdef VRDP_NO_COM
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPAudioVolume (mhServer, left, right);
@@ -1915 +1915 @@
 #ifdef VBOX_VRDP
 #ifdef VRDP_NO_COM
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPUSBRequest (mhServer, u32ClientId, pvParms, cbParms);
@@ -1930 +1930 @@
 #ifdef VBOX_VRDP
 #ifdef VRDP_NO_COM
-    if (mpEntryPoints)
+    if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDPQueryInfo (mhServer, index, pvBuffer, cbBuffer, pcbOut);