Changeset 86737 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Oct 28, 2020 2:00:58 PM (5 years ago)

Author:

vboxsync

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

141127

Message:

Shared Clipboard/X11: First unregister, then uninit context for testcase. bugref:9848

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• clipboard-x11.cpp (modified) (2 diffs)
• testcase/tstClipboardGH-X11.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -336 +336 @@
     AssertPtrReturnVoid(pCtx);
 
-    Widget widget = pCtx->pWidget;
-    AssertPtrReturnVoid(widget);
+    Widget pWidget = pCtx->pWidget;
+    AssertPtrReturnVoid(pWidget);
 
     bool fFound = false;
     for (unsigned i = 0; i < RT_ELEMENTS(g_aContexts); ++i)
     {
-        Assert(!fFound || g_aContexts[i].pWidget != widget);
-        if (g_aContexts[i].pWidget == widget)
+        Assert(!fFound || g_aContexts[i].pWidget != pWidget);
+        if (g_aContexts[i].pWidget == pWidget)
         {
             Assert(g_aContexts[i].pCtx != NULL);
@@ -1183 +1183 @@
 #ifdef TESTCASE
     /** @todo The testcases currently do not utilize the threading code. So uninit stuff here. */
+    clipUnregisterContext(pCtx);
     clipUninitInternal(pCtx);
-    clipUnregisterContext(pCtx);
 #endif
 

trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardGH-X11.cpp

@@ -915 +915 @@
 
     ShClX11Destroy(&X11Ctx);
-    /* Note: Doing this twice is intentional. */
-    ShClX11Destroy(&X11Ctx);
 
     return RTTestSummaryAndDestroy(hTest);