Changeset 44109 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Dec 12, 2012 2:34:07 PM (12 years ago)

Author:

vboxsync

Message:

forward-ported r82653 from 4.2 branch (Additions/VBoxTray: don't refuse to start VBoxTray if we cannot connect to the shared folders host service)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox/Additions/WINNT/VBoxTray/VBoxSharedFolders.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSharedFolders.cpp

@@ -27 +27 @@
     uint32_t u32ClientId;
     int rc = VbglR3SharedFolderConnect(&u32ClientId);
-    if (RT_FAILURE(rc))
-        Log(("VBoxTray: Failed to connect to the shared folder service, error %Rrc\n", rc));
-    else
+    if (RT_SUCCESS(rc))
     {
         uint32_t cMappings;
@@ -128 +126 @@
         VbglR3SharedFolderDisconnect(u32ClientId);
     }
+    else
+    {
+        Log(("VBoxTray: Failed to connect to the shared folder service, error %Rrc\n", rc));
+        /* return success, otherwise VBoxTray will not start! */
+        rc = VINF_SUCCESS;
+    }
     return rc;
 }