Changeset 99597 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

May 4, 2023 9:12:46 AM (22 months ago)

Author:

vboxsync

Message:

Guest Additions/VBoxClient: Moved the X11-specific code for drag'n drop into an own submodule and using the actual service as a (runtime) wrapper (for also the Wayland-specific code later) [build fix]. bugref:10427

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• draganddrop.cpp (modified) (1 diff)
• draganddrop.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -81 +81 @@
 static DECLCALLBACK(int) vbclDnDTerm(void)
 {
-    return g_pSvc->term();
+    int rc = VINF_SUCCESS;
+
+    if (g_pSvc)
+    {
+        rc = g_pSvc->term();
+
+        delete g_pSvc;
+        g_pSvc = NULL;
+    }
+
+    return rc;
 }
 

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.h

@@ -83 +83 @@
 public:
 
+    virtual ~VBClDnDSvc(void) { }
+
+public:
+
     virtual int  init(void) = 0;
     virtual int  worker(bool volatile *pfShutdown) = 0;