diff options
| author | Vincent Lucas <chenzo@jitsi.org> | 2013-05-28 22:10:18 +0200 |
|---|---|---|
| committer | Vincent Lucas <chenzo@jitsi.org> | 2013-05-28 22:10:18 +0200 |
| commit | 6e2ef5898dbbbf8b56e0d1004c050b481265e469 (patch) | |
| tree | 3948cc4a1e5c914a9c840c53d2d76fb9215b01b5 /src/native/addrbook/msoutlook | |
| parent | 57a66b431979414b25d825fbc4e458f95a759e3c (diff) | |
| parent | f4e5fad744eb1fc614896de56ba71a514e329eae (diff) | |
| download | jitsi-6e2ef5898dbbbf8b56e0d1004c050b481265e469.zip jitsi-6e2ef5898dbbbf8b56e0d1004c050b481265e469.tar.gz jitsi-6e2ef5898dbbbf8b56e0d1004c050b481265e469.tar.bz2 | |
Merge branch 'msoutlookaddrbook'
Diffstat (limited to 'src/native/addrbook/msoutlook')
| -rw-r--r-- | src/native/addrbook/msoutlook/com/ComClient.cxx | 3 | ||||
| -rw-r--r-- | src/native/addrbook/msoutlook/com/server/Server.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/native/addrbook/msoutlook/com/ComClient.cxx b/src/native/addrbook/msoutlook/com/ComClient.cxx index b13dcf3..4c3dfcf 100644 --- a/src/native/addrbook/msoutlook/com/ComClient.cxx +++ b/src/native/addrbook/msoutlook/com/ComClient.cxx @@ -43,7 +43,8 @@ void ComClient_start(void) { HRESULT hr = E_FAIL; - if(CoInitializeEx(NULL, COINIT_MULTITHREADED) == S_OK) + if((hr = CoInitializeEx(NULL, COINIT_MULTITHREADED)) == S_OK + || hr == S_FALSE) { // The server may be long to start, then retry 10 times with 1s pause // between each try. diff --git a/src/native/addrbook/msoutlook/com/server/Server.cxx b/src/native/addrbook/msoutlook/com/server/Server.cxx index 44cd872..fcdd731 100644 --- a/src/native/addrbook/msoutlook/com/server/Server.cxx +++ b/src/native/addrbook/msoutlook/com/server/Server.cxx @@ -29,7 +29,8 @@ int main(int argc, char** argv) { HRESULT hr = E_FAIL; - if(::CoInitializeEx(NULL, COINIT_MULTITHREADED) != S_OK) + if((hr = ::CoInitializeEx(NULL, COINIT_MULTITHREADED)) != S_OK + && hr != S_FALSE) { return hr; } |