Changeset 97798 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 13, 2022 5:10:34 PM (2 years ago)

Author:

vboxsync

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

154873

Message:

DnD/Main: Reset handling fixes: Use reset() with the GuestDnDState constructor; shorter and less error prone. No need to perform a reset within the destructor.

File:

• trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

@@ -295 +295 @@
 
 GuestDnDState::GuestDnDState(const ComObjPtr<Guest>& pGuest)
-    : m_enmState(VBOXDNDSTATE_UNKNOWN)
-    , m_uProtocolVersion(0)
+    : m_uProtocolVersion(0)
     , m_fGuestFeatures0(VBOX_DND_GF_NONE)
     , m_EventSem(NIL_RTSEMEVENT)
-    , m_rcGuest(VERR_IPE_UNINITIALIZED_STATUS)
-    , m_dndActionDefault(0)
-    , m_dndLstActionsAllowed(0)
     , m_pParent(pGuest)
 {
+    reset();
+
     int rc = RTCritSectInit(&m_CritSect);
     if (RT_FAILURE(rc))
@@ -314 +312 @@
 GuestDnDState::~GuestDnDState(void)
 {
-    reset();
-
     int rc = RTSemEventDestroy(m_EventSem);
     AssertRC(rc);