From b3abd492da8c300231019c0ed419c5917d3ba9e8 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Mon, 14 Mar 2011 12:45:44 -0400 Subject: [PATCH] bug 640190 - Browser process dies, and second attempt hangs on restart when switching languages r=crowder a=blocking-fennec --- widget/src/android/nsAppShell.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widget/src/android/nsAppShell.cpp b/widget/src/android/nsAppShell.cpp index e694ee04244..19b1146dd4b 100644 --- a/widget/src/android/nsAppShell.cpp +++ b/widget/src/android/nsAppShell.cpp @@ -154,6 +154,7 @@ nsAppShell::Observe(nsISupports* aSubject, // We need to ensure no observers stick around after XPCOM shuts down // or we'll see crashes, as the app shell outlives XPConnect. mObserversHash.Clear(); + return nsBaseAppShell::Observe(aSubject, aTopic, aData); } else if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) && ( !wcscmp((const wchar_t*)aData, L"intl.locale.matchOS") || !wcscmp((const wchar_t*)aData, L"general.useragent.locale"))) { @@ -171,8 +172,7 @@ nsAppShell::Observe(nsISupports* aSubject, bridge->SetSelectedLocale(EmptyCString()); return NS_OK; } - - return nsBaseAppShell::Observe(aSubject, aTopic, aData); + return NS_OK; } void