mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 16:55:40 +00:00
bug 640190 - Browser process dies, and second attempt hangs on restart when switching languages r=crowder a=blocking-fennec
This commit is contained in:
parent
5ac7d8b1d9
commit
29237dd0a0
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user