Commit 136de94d authored by John Schoenick's avatar John Schoenick
Browse files

Bug 782707 - Avoid an assertion in nsObjectLoadingContent. r=josh

parent d434b20a

content/base/src/nsObjectLoadingContent.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1519,7 +1519,9 @@ nsObjectLoadingContent::LoadObject(bool aNotify, 


  ParameterUpdateFlags stateChange = UpdateObjectParameters();



  if (!stateChange && !aForceLoad) {

  // If nothing changed and we are not force-loading, or we're in state loading

  // but continuing to wait on a channel, we're done

  if ((!stateChange && !aForceLoad) || (mType == eType_Loading && mChannel)) {

    return NS_OK;

  }