Changeset 2729 in vbox for trunk/src

Timestamp:

May 21, 2007 12:13:01 PM (18 years ago)

Author:

vboxsync

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

21328

Message:

FE/SDL: fixed two potential races when terminating the VM

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -278 +278 @@
 #ifdef VBOX_SECURELABEL
         Assert(key);
-        /*
-         * check if we're interested in the message
-         */
-        Guid ourGuid;
-        Guid messageGuid = machineId;
-        gMachine->COMGETTER(Id)(ourGuid.asOutParam());
-        if (ourGuid == messageGuid)
-        {
-            Bstr keyString = key;
-            if (keyString && keyString == VBOXSDL_SECURELABEL_EXTRADATA)
-            {
-                /*
-                 * Notify SDL thread of the string update
-                 */
-                SDL_Event event  = {0};
-                event.type       = SDL_USEREVENT;
-                event.user.type  = SDL_USER_EVENT_SECURELABEL_UPDATE;
-                int rc = SDL_PushEvent(&event);
-                NOREF(rc);
-                AssertMsg(!rc, ("SDL_PushEvent returned with SDL error '%s'\n", SDL_GetError()));
+        if (gMachine)
+        {
+            /*
+             * check if we're interested in the message
+             */
+            Guid ourGuid;
+            Guid messageGuid = machineId;
+            gMachine->COMGETTER(Id)(ourGuid.asOutParam());
+            if (ourGuid == messageGuid)
+            {
+                Bstr keyString = key;
+                if (keyString && keyString == VBOXSDL_SECURELABEL_EXTRADATA)
+                {
+                    /*
+                     * Notify SDL thread of the string update
+                     */
+                    SDL_Event event  = {0};
+                    event.type       = SDL_USEREVENT;
+                    event.user.type  = SDL_USER_EVENT_SECURELABEL_UPDATE;
+                    int rc = SDL_PushEvent(&event);
+                    NOREF(rc);
+                    AssertMsg(!rc, ("SDL_PushEvent returned with SDL error '%s'\n", SDL_GetError()));
+                }
             }
         }
@@ -2501 +2504 @@
 
     LogFlow(("Releasing mouse, keyboard, vrdpserver, display, console...\n"));
+    gDisplay->SetupInternalFramebuffer(0);
     gMouse = NULL;
     gKeyboard = NULL;