From 87fc4001bc0579d59f051afe33ed449e184543ef Mon Sep 17 00:00:00 2001 From: Bill McCloskey Date: Fri, 21 Nov 2014 14:00:24 -0800 Subject: [PATCH] Bug 1102898 - Need to unregister plugin offline observer on Mac, Linux (r=bsmedberg) --- dom/plugins/ipc/PluginModuleParent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp index cd02d892a6a6..59499cdd5e31 100755 --- a/dom/plugins/ipc/PluginModuleParent.cpp +++ b/dom/plugins/ipc/PluginModuleParent.cpp @@ -289,14 +289,14 @@ PluginModuleChromeParent::~PluginModuleChromeParent() UnregisterInjectorCallback(mFlashProcess2); #endif + UnregisterSettingsCallbacks(); + Preferences::UnregisterCallback(TimeoutChanged, kChildTimeoutPref, this); Preferences::UnregisterCallback(TimeoutChanged, kParentTimeoutPref, this); #ifdef XP_WIN Preferences::UnregisterCallback(TimeoutChanged, kHangUITimeoutPref, this); Preferences::UnregisterCallback(TimeoutChanged, kHangUIMinDisplayPref, this); - UnregisterSettingsCallbacks(); - if (mHangUIParent) { delete mHangUIParent; mHangUIParent = nullptr;