Changeset 78900 in vbox

Timestamp:

May 31, 2019 3:46:15 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Build fix.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (3 diffs)

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

@@ -5373 +5373 @@
             || mMachineState == MachineState_Teleporting
             || mMachineState == MachineState_LiveSnapshotting)
-            i_changeClipboardMode(aClipboardMode);
+        {
+            int vrc = i_changeClipboardMode(aClipboardMode);
+            if (RT_FAILURE(vrc))
+                rc = E_FAIL; /** @todo r=andy Set error info here? */
+        }
         else
             rc = i_setInvalidMachineStateError();
@@ -9257 +9261 @@
 int Console::i_changeClipboardMode(ClipboardMode_T aClipboardMode)
 {
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
     VMMDev *pVMMDev = m_pVMMDev;
     AssertPtrReturn(pVMMDev, VERR_INVALID_POINTER);
@@ -9284 +9289 @@
     }
 
-    int rc = pVMMDev->hgcmHostCall("VBoxSharedClipboard", VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE, 1, &parm);
-    if (RT_FAILURE(rc))
-        LogRel(("Shared Clipboard: Error changing mode: %Rrc\n", rc));
-
-    return rc;
+    int vrc = pVMMDev->hgcmHostCall("VBoxSharedClipboard", VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE, 1, &parm);
+    if (RT_FAILURE(vrc))
+        LogRel(("Shared Clipboard: Error changing mode: %Rrc\n", vrc));
+
+    return vrc;
+#else
+    return VERR_NOT_IMPLEMENTED;
+#endif
 }