wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 799419: Force NSS startup during PeerConnection Initialize r=bsmith,jesup

Browse Source
This commit is contained in:
EKR 2012-11-18 07:43:26 -08:00
parent 645ded6229
commit e0a0253926
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
View File

@ -371,6 +371,14 @@ PeerConnectionImpl::Initialize(IPeerConnectionObserver* aObserver,
MOZ_ASSERT(aObserver);
mPCObserver = aObserver;
nsresult res;
#ifdef MOZILLA_INTERNAL_API
// This code interferes with the C++ unit test startup code.
nsCOMPtr<nsISupports> nssDummy = do_GetService("@mozilla.org/psm;1", &res);
NS_ENSURE_SUCCESS(res, res);
#endif
#ifdef MOZILLA_INTERNAL_API
// Currently no standalone unit tests for DataChannel,
// which is the user of mWindow
@ -396,7 +404,7 @@ PeerConnectionImpl::Initialize(IPeerConnectionObserver* aObserver,
mMedia->SignalIceCompleted.connect(this, &PeerConnectionImpl::IceCompleted);
// Initialize the media object.
nsresult res = mMedia->Init();
res = mMedia->Init();
if (NS_FAILED(res)) {
CSFLogErrorS(logTag, __FUNCTION__ << ": Couldn't initialize media object");
return res;