From b0bc77b9da451781ff6b93f0e1b470f2bd41537c Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx-pkg@fobos.de>
Date: Thu, 21 Jun 2012 10:56:05 +0200
Subject: Imported Upstream version 4.1.18-dfsg

---
 src/VBox/Main/src-client/ConsoleImpl.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/VBox/Main/src-client/ConsoleImpl.cpp')

diff --git a/src/VBox/Main/src-client/ConsoleImpl.cpp b/src/VBox/Main/src-client/ConsoleImpl.cpp
index ed500f140..287e1d5e0 100644
--- a/src/VBox/Main/src-client/ConsoleImpl.cpp
+++ b/src/VBox/Main/src-client/ConsoleImpl.cpp
@@ -59,6 +59,9 @@
 #ifdef VBOX_WITH_USB_VIDEO
 # include "UsbWebcamInterface.h"
 #endif
+#ifdef VBOX_WITH_USB_CARDREADER
+# include "UsbCardReader.h"
+#endif
 #include "ProgressCombinedImpl.h"
 #include "ConsoleVRDPServer.h"
 #include "VMMDev.h"
@@ -376,6 +379,9 @@ Console::Console()
     , mAudioSniffer(NULL)
 #ifdef VBOX_WITH_USB_VIDEO
     , mUsbWebcamInterface(NULL)
+#endif
+#ifdef VBOX_WITH_USB_CARDREADER
+    , mUsbCardReader(NULL)
 #endif
     , mBusMgr(NULL)
     , mVMStateChangeCallbackDisabled(false)
@@ -518,6 +524,10 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl)
     unconst(mUsbWebcamInterface) = new UsbWebcamInterface(this);
     AssertReturn(mUsbWebcamInterface, E_FAIL);
 #endif
+#ifdef VBOX_WITH_USB_CARDREADER
+    unconst(mUsbCardReader) = new UsbCardReader(this);
+    AssertReturn(mUsbCardReader, E_FAIL);
+#endif
 
     /* VirtualBox events registration. */
     {
@@ -617,6 +627,14 @@ void Console::uninit()
     }
 #endif
 
+#ifdef VBOX_WITH_USB_CARDREADER
+    if (mUsbCardReader)
+    {
+        delete mUsbCardReader;
+        unconst(mUsbCardReader) = NULL;
+    }
+#endif
+
     if (mAudioSniffer)
     {
         delete mAudioSniffer;
@@ -1139,6 +1157,7 @@ void Console::VRDPClientStatusChange(uint32_t u32ClientId, const char *pszStatus
 
     LogFlowFunc(("%s\n", pszStatus));
 
+#ifdef VBOX_WITH_GUEST_PROPS
     /* Parse the status string. */
     if (RTStrICmp(pszStatus, "ATTACH") == 0)
     {
@@ -1152,6 +1171,7 @@ void Console::VRDPClientStatusChange(uint32_t u32ClientId, const char *pszStatus
     {
         guestPropertiesVRDPUpdateNameChange(u32ClientId, pszStatus + strlen("NAME="));
     }
+#endif
 
     LogFlowFuncLeave();
 }
-- 
cgit v1.2.3