Bug 1240484 - fixed control flow patch issue by adding brackets. r?mccr8 draft
authorBogdan Postelnicu <bogdan.postelnicu@softvision.ro>
Mon, 18 Jan 2016 13:01:06 +0200
changeset 322310 f5941307e5a47aa6347b3f42d7d9e0829cdb3f16
parent 322303 0a4331e7d7ba21c3a54d9f17fb6ed1f42b7c29ec
child 513082 a4991593994993aad4b43d5bb98fdaf37c5a2b3d
push id9584
push userbmo:bogdan.postelnicu@softvision.ro
push dateMon, 18 Jan 2016 11:02:13 +0000
reviewersmccr8
bugs1240484
milestone46.0a1
Bug 1240484 - fixed control flow patch issue by adding brackets. r?mccr8
xpcom/build/XPCOMInit.cpp
--- a/xpcom/build/XPCOMInit.cpp
+++ b/xpcom/build/XPCOMInit.cpp
@@ -848,20 +848,22 @@ ShutdownXPCOM(nsIServiceManager* aServMg
 
     // This must happen after the shutdown of media and widgets, which
     // are triggered by the NS_XPCOM_SHUTDOWN_OBSERVER_ID notification.
     NS_ProcessPendingEvents(thread);
     gfxPlatform::ShutdownLayersIPC();
 
     mozilla::scache::StartupCache::DeleteSingleton();
     if (observerService)
+    {
       mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownThreads);
       observerService->NotifyObservers(nullptr,
                                        NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID,
                                        nullptr);
+    }
 
     gXPCOMThreadsShutDown = true;
     NS_ProcessPendingEvents(thread);
 
     // Shutdown the timer thread and all timers that might still be alive before
     // shutting down the component manager
     nsTimerImpl::Shutdown();