From 984c643c776b2c714d5b162dce432948918fcc04 Mon Sep 17 00:00:00 2001 From: "rusty.lynch%intel.com" Date: Sat, 6 May 2000 06:00:48 +0000 Subject: [PATCH] Fix for bug #797. -r=av --- modules/plugin/base/src/nsPluginHostImpl.cpp | 6 ++++++ modules/plugin/nglsrc/nsPluginHostImpl.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp index 4d3d0f7bb1e..5e4bfa56bee 100644 --- a/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -1528,6 +1528,12 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, if(rv == NS_OK) rv = aOwner->GetInstance(instance); + else if (aMimeType) + // We were unable to find a plug-in yet we + // really do have mime type. Return the error + // so that the nsObjectFrame can render any + // alternate content. + return rv; // if we have a failure error, it means we found a plugin for the mimetype, // but we had a problem with the entry point diff --git a/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/modules/plugin/nglsrc/nsPluginHostImpl.cpp index 4d3d0f7bb1e..5e4bfa56bee 100644 --- a/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -1528,6 +1528,12 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, if(rv == NS_OK) rv = aOwner->GetInstance(instance); + else if (aMimeType) + // We were unable to find a plug-in yet we + // really do have mime type. Return the error + // so that the nsObjectFrame can render any + // alternate content. + return rv; // if we have a failure error, it means we found a plugin for the mimetype, // but we had a problem with the entry point