Bug 781394 - Don't fire plugin errors for plugins that never got to a determined type. r=josh

This commit is contained in:
John Schoenick 2012-08-14 11:46:53 -07:00
parent 57fe127515
commit 59273e427e

View File

@ -1812,10 +1812,11 @@ nsObjectLoadingContent::LoadObject(bool aNotify,
// Notify of our final state if we haven't already
NotifyStateChanged(oldType, oldState, false, aNotify);
if (mType == eType_Null && mFallbackType != eFallbackAlternate) {
// if we're not showing alternate content, fire a pluginerror to trigger
// (we stopped LoadFallback from doing so above, it doesn't know of our old
// state)
if (mType == eType_Null && !mContentType.IsEmpty() &&
mFallbackType != eFallbackAlternate) {
// if we have a content type and are not showing alternate
// content, fire a pluginerror to trigger (we stopped LoadFallback
// from doing so above, it doesn't know of our old state)
FirePluginError(mFallbackType);
}