diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp index d4748d1cf312..f1de34cbfa05 100644 --- a/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/xpfe/appshell/src/nsWebShellWindow.cpp @@ -1710,6 +1710,7 @@ nsWebShellWindow::NotifyObservers( const nsString &aTopic, const nsString &someD NS_IMETHODIMP nsWebShellWindow::Destroy() { #ifdef USE_NATIVE_MENUS + { // unregister as document listener // this is needed for menus nsCOMPtr cv; @@ -1723,6 +1724,7 @@ NS_IMETHODIMP nsWebShellWindow::Destroy() if(doc) doc->RemoveObserver(NS_STATIC_CAST(nsIDocumentObserver*, this)); } + } #endif return nsXULWindow::Destroy(); diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp index 9d73a01ea15a..50a8bf9633e9 100644 --- a/xpfe/appshell/src/nsXULWindow.cpp +++ b/xpfe/appshell/src/nsXULWindow.cpp @@ -370,6 +370,7 @@ NS_IMETHODIMP nsXULWindow::Destroy() return NS_OK; #ifdef XP_MAC // Anyone still using native menus should add themselves here. + { // unregister as document listener // this is needed for menus nsCOMPtr cv; @@ -383,6 +384,7 @@ NS_IMETHODIMP nsXULWindow::Destroy() /* if(doc) doc->RemoveObserver(NS_STATIC_CAST(nsIDocumentObserver*, this)); */ } + } #endif nsCOMPtr appShell(do_GetService(kAppShellServiceCID));