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 756389 - B2G Bluetooth: unexpected crash in DBusThread::StopEventLoop; r=cjones

Browse Source
This commit is contained in:
Kyle Machulis 2012-05-23 18:21:42 -07:00
parent c4a1fa5a03
commit 5ea07200ba
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/system/gonk/SystemWorkerManager.cpp
View File

@ -211,14 +211,23 @@ SystemWorkerManager::Init()
}
nsresult rv = InitRIL(cx);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
NS_WARNING("Failed to initialize RIL/Telephony!");
return rv;
}
rv = InitWifi(cx);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
NS_WARNING("Failed to initialize WiFi Networking!");
return rv;
}
#ifdef MOZ_B2G_BT
rv = InitBluetooth(cx);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
NS_WARNING("Failed to initialize Bluetooth!");
return rv;
}
#endif
nsCOMPtr<nsIObserverService> obs =
@ -229,7 +238,10 @@ SystemWorkerManager::Init()
}
rv = obs->AddObserver(this, WORKERS_SHUTDOWN_TOPIC, false);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
NS_WARNING("Failed to initialize worker shutdown event!");
return rv;
}
return NS_OK;
}

12
ipc/dbus/DBusThread.cpp
View File

@ -531,8 +531,10 @@ DBusThread::IsEventLoopRunning()
static void
ConnectDBus(Monitor* aMonitor, bool* aSuccess)
{
MOZ_ASSERT(!sDBusThread);
if(sDBusThread) {
NS_WARNING("Trying to start DBus Thread that is already currently running, skipping.");
return;
}
sDBusThread = new DBusThread();
*aSuccess = true;
if(!sDBusThread->StartEventLoop())
@ -548,8 +550,10 @@ ConnectDBus(Monitor* aMonitor, bool* aSuccess)
static void
DisconnectDBus(Monitor* aMonitor, bool* aSuccess)
{
MOZ_ASSERT(sDBusThread);
if(!sDBusThread) {
NS_WARNING("Trying to shutdown DBus Thread that is not currently running, skipping.");
return;
}
*aSuccess = true;
sDBusThread->StopEventLoop();
sDBusThread = NULL;