Index: /trunk/src/VBox/Additions/common/crOpenGL/context.c
===================================================================
--- /trunk/src/VBox/Additions/common/crOpenGL/context.c	(revision 55617)
+++ /trunk/src/VBox/Additions/common/crOpenGL/context.c	(revision 55618)
@@ -477,6 +477,5 @@
  */
     ContextInfo *
-stubNewContext( const char *dpyName, GLint visBits, ContextType type,
-    unsigned long shareCtx
+stubNewContext(char *dpyName, GLint visBits, ContextType type, unsigned long shareCtx
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
         , struct VBOXUHGSMI *pHgsmi
@@ -692,5 +691,5 @@
 
 void
-stubGetWindowGeometry(const WindowInfo *window, int *x, int *y,
+stubGetWindowGeometry(WindowInfo *window, int *x, int *y,
                       unsigned int *w, unsigned int *h )
 {
@@ -1131,5 +1130,5 @@
         if (!spuConnection)
         {
-            crWarning("VBoxConCreate failed");
+            crError("VBoxConCreate failed");
             return GL_FALSE;
         }
@@ -1393,8 +1392,8 @@
 
     context = (ContextInfo *) crHashtableSearch(stub.contextTable, contextId);
-
-    CRASSERT(context);
-
-    stubDestroyContextLocked(context);
+    if (context)
+        stubDestroyContextLocked(context);
+    else
+        crError("No context.");
 
 #ifdef CHROMIUM_THREADSAFE