bug 640190 - Browser process dies, and second attempt hangs on restart when switching languages r=crowder a=blocking-fennec

This commit is contained in:
Brad Lassey 2011-03-14 12:45:44 -04:00
Родитель f6f588d0be
Коммит b3abd492da
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -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