mozilla-central: changeset 56858:493fe7f156e50eaa94ff460ededaeb98f7fab60b

author	Boris Zbarsky <bzbarsky@mit.edu>
	Thu, 04 Nov 2010 16:06:05 -0400
changeset 56858	493fe7f156e50eaa94ff460ededaeb98f7fab60b
parent 56854	f7016571b4726d9f465ef4b698f0e9e88adaa3ea
child 56859	4467f70ed6df12458caef94de28c7502557d97f6
push id	16716
push user	bzbarsky@mozilla.com
push date	Thu, 04 Nov 2010 20:06:47 +0000
treeherder	mozilla-central@c0dbdafa583c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bsmedberg
bugs	578890
milestone	2.0b8pre
first release with	nightly linux32 5947e95a21d1 / 4.0b8pre / 20101105025919 / files nightly linux64 5947e95a21d1 / 4.0b8pre / 20101105030809 / files nightly mac 5947e95a21d1 / 4.0b8pre / 20101105030743 / files nightly win32 5947e95a21d1 / 4.0b8pre / 20101105041932 / files nightly win64 a1705bc179e4 / 4.0b8pre / 20101105054821 / files
last release without	nightly linux32 f7016571b472 / 4.0b8pre / 20101104025921 / files nightly linux64 f7016571b472 / 4.0b8pre / 20101104030828 / files nightly mac f7016571b472 / 4.0b8pre / 20101104030743 / files nightly win32 f7016571b472 / 4.0b8pre / 20101104041903 / files nightly win64 f7016571b472 / 4.0b8pre / 20101104054656 / files

--- a/modules/libpref/src/nsPrefBranch.cpp
+++ b/modules/libpref/src/nsPrefBranch.cpp
@@ -111,16 +111,21 @@ nsPrefBranch::nsPrefBranch(const char *a
     observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
     --mRefCnt;
   }
 }
 
 nsPrefBranch::~nsPrefBranch()
 {
   freeObserverList();
+
+  nsCOMPtr<nsIObserverService> observerService =
+    mozilla::services::GetObserverService();
+  if (observerService)
+    observerService->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
 }
 
 
 /*
  * nsISupports Implementation
  */
 
 NS_IMPL_THREADSAFE_ADDREF(nsPrefBranch)