зеркало из https://github.com/mozilla/pjs.git
Changed assertion to warning when platform charset doesn't exist.
This commit is contained in:
Родитель
a8f519e4a0
Коммит
0f03daef22
|
@ -139,7 +139,9 @@ nsFSStringConversion::PrepareFSCharset()
|
||||||
{
|
{
|
||||||
// lazy eval of the file system charset
|
// lazy eval of the file system charset
|
||||||
NS_WITH_SERVICE(nsIPlatformCharset, pcharset, NS_PLATFORMCHARSET_PROGID, &res);
|
NS_WITH_SERVICE(nsIPlatformCharset, pcharset, NS_PLATFORMCHARSET_PROGID, &res);
|
||||||
NS_ASSERTION((NS_SUCCEEDED(res) && pcharset), "cannot get platform charset");
|
if (!(NS_SUCCEEDED(res) && pcharset)) {
|
||||||
|
NS_WARNING("cannot get platform charset");
|
||||||
|
}
|
||||||
if(NS_SUCCEEDED(res) && pcharset) {
|
if(NS_SUCCEEDED(res) && pcharset) {
|
||||||
res = pcharset->GetCharset(kPlatformCharsetSel_FileName, mFSCharset);
|
res = pcharset->GetCharset(kPlatformCharsetSel_FileName, mFSCharset);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче