Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 87413. r=shanjian sr=sfraser

Browse Source 
backout shanjian's check in which cuase infinite loop while
auto detect is turn on and got different result from meta tag


git-svn-id: svn://10.0.0.236/trunk@98487 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ftang%netscape.com
2001-07-02 22:36:08 +00:00
parent da18a12ff2
commit b38b31bbad
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -630,8 +630,11 @@ nsWebShell::ReloadDocument(const char* aCharset,
{
muDV->SetHintCharacterSet(NS_ConvertASCIItoUCS2(aCharset).get());
muDV->SetHintCharacterSetSource((PRInt32)aSource);
mCharsetReloadState = eCharsetReloadRequested;
return Reload(LOAD_FLAGS_CHARSET_CHANGE);
if(eCharsetReloadRequested != mCharsetReloadState)
{
mCharsetReloadState = eCharsetReloadRequested;
return Reload(LOAD_FLAGS_CHARSET_CHANGE);
}
}
}
}