Changeset 49662 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 26, 2013 3:43:22 PM (11 years ago)

Author:

vboxsync

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

90917

Message:

VRDEServerImpl: minor fixes for r90887

File:

• trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp

@@ -512 +512 @@
     if (!mData->mEnabled)
     {
-        aProperties.resize(cProperties);
         return S_OK;
     }
@@ -679 +678 @@
         ComPtr<ISystemProperties> systemProperties;
         HRESULT hrc = mParent->getVirtualBox()->COMGETTER(SystemProperties)(systemProperties.asOutParam());
-        Bstr strlib;
         if (SUCCEEDED(hrc))
         {
+            Bstr strlib;
             hrc = systemProperties->COMGETTER(VRDEAuthLibrary)(strlib.asOutParam());
-            aLibrary = Utf8Str(strlib).c_str();
+            if (SUCCEEDED(hrc))
+                aLibrary = Utf8Str(strlib).c_str();
         }
 
@@ -818 +818 @@
     {
         /* Get the global setting. */
-        BSTR bstr;
         ComPtr<ISystemProperties> systemProperties;
         hrc = mParent->getVirtualBox()->COMGETTER(SystemProperties)(systemProperties.asOutParam());
         if (SUCCEEDED(hrc))
+        {
+            BSTR bstr;
             hrc = systemProperties->COMGETTER(DefaultVRDEExtPack)(&bstr);
-        aExtPack = Utf8Str(bstr);
+            if (SUCCEEDED(hrc))
+                aExtPack = Utf8Str(bstr);
+        }
     }
     return hrc;