3 files changed, 9 insertions, 29 deletions
diff --git a/lib/native/windows-64/jmsoutlookaddrbook.dll b/lib/native/windows-64/jmsoutlookaddrbook.dll
index cc15290..f11a955 100644
--- a/lib/native/windows-64/jmsoutlookaddrbook.dll
+++ b/lib/native/windows-64/jmsoutlookaddrbook.dll
diff --git a/lib/native/windows/jmsoutlookaddrbook.dll b/lib/native/windows/jmsoutlookaddrbook.dll
index 24341f0..c1a09a5 100644
--- a/lib/native/windows/jmsoutlookaddrbook.dll
+++ b/lib/native/windows/jmsoutlookaddrbook.dll
diff --git a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx
index fa37e95..aacc4bb 100644
--- a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx
+++ b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx
@@ -338,7 +338,6 @@ Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContac
                         hResult
                             = MsOutlookAddrBookContactSourceService_mapiInitialize(
                                     &mapiInit);
-                        ::SetCurrentDirectory(lpszWorkingDir);
 
                         if(HR_SUCCEEDED(hResult)
                                 && MAPISession_getMapiSession() == NULL)
@@ -356,6 +355,7 @@ Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContac
                                     mapiSession,
                                     notificationsDelegate);
                         }
+                        ::SetCurrentDirectory(lpszWorkingDir);
                         MAPISession_unlock();
                     }
                     else
@@ -489,34 +489,14 @@ MsOutlookAddrBook_mapiLogonEx
         hResult = S_OK;
     else
     {
-        DWORD dwSize = ::GetCurrentDirectory(0, NULL);
-        if (dwSize > 0)
-        {
-            LPTSTR lpszWorkingDir = (LPTSTR)::malloc(dwSize*sizeof(TCHAR));
-            DWORD dwResult = ::GetCurrentDirectory(dwSize, lpszWorkingDir);
-            if (dwResult != 0)
-            {
-                hResult
-                    = MsOutlookAddrBookContactSourceService_mapiLogonEx(
-                            uiParam,
-                            profileName, password,
-                            flags,
-                            &currentMapiSession);
-                ::SetCurrentDirectory(lpszWorkingDir);
-
-                MAPISession_setMapiSession(currentMapiSession);
-            }
-            else
-            {
-                hResult = HRESULT_FROM_WIN32(::GetLastError());
-            }
-
-            ::free(lpszWorkingDir);
-        }
-        else
-        {
-            hResult = HRESULT_FROM_WIN32(::GetLastError());
-        }
+        hResult
+            = MsOutlookAddrBookContactSourceService_mapiLogonEx(
+                    uiParam,
+                    profileName, password,
+                    flags,
+                    &currentMapiSession);
+
+        MAPISession_setMapiSession(currentMapiSession);
     }
 
     if (HR_SUCCEEDED(hResult))