Fixed crash on closing window

sailfishos · Jul 8, 2014 · 175a095 · 175a095
1 parent e5a1ea6
commit 175a095
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
@@ -259,6 +259,7 @@ NS_INTERFACE_MAP_END
 
 static uint32_t sESMInstanceCount = 0;
 static bool sPointerEventEnabled = false;
+static bool sPrefInitialized = false;
 
 int32_t EventStateManager::sUserInputEventDepth = 0;
 bool EventStateManager::sNormalLMouseEventInProcess = false;
@@ -337,8 +338,9 @@ EventStateManager::Init()
 
   observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, true);
 
-  if (sESMInstanceCount == 1) {
+  if (!sPrefInitialized) {
     Prefs::Init();
+    sPrefInitialized = true;
   }
 
   return NS_OK;

diff --git a/embedding/embedlite/embedthread/EmbedLitePuppetWidget.cpp b/embedding/embedlite/embedthread/EmbedLitePuppetWidget.cpp
@@ -171,14 +171,15 @@ EmbedLitePuppetWidget::Destroy()
 
   mOnDestroyCalled = true;
 
-  Base::OnDestroy();
-  Base::Destroy();
   nsIWidget* topWidget = GetTopLevelWidget();
   if (mLayerManager && topWidget == this) {
     mLayerManager->Destroy();
   }
-  mParent = nullptr;
   mLayerManager = nullptr;
+
+  Base::OnDestroy();
+  Base::Destroy();
+  mParent = nullptr;
   mEmbed = nullptr;
   mChild = nullptr;