diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 71c43ac9c79..df92a94a837 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -804,10 +804,10 @@ nsPluginTag::~nsPluginTag() void nsPluginTag::TryUnloadPlugin(PRBool aForceShutdown) { - PRBool isXPCOM = PR_FALSE; - if (!(mFlags & NS_PLUGIN_FLAG_OLDSCHOOL)) - isXPCOM = PR_TRUE; - + PRBool isXPCOM = PR_FALSE; + if (!(mFlags & NS_PLUGIN_FLAG_OLDSCHOOL)) + isXPCOM = PR_TRUE; + if (isXPCOM && !aForceShutdown) return; if (mEntryPoint) diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index 71c43ac9c79..df92a94a837 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -804,10 +804,10 @@ nsPluginTag::~nsPluginTag() void nsPluginTag::TryUnloadPlugin(PRBool aForceShutdown) { - PRBool isXPCOM = PR_FALSE; - if (!(mFlags & NS_PLUGIN_FLAG_OLDSCHOOL)) - isXPCOM = PR_TRUE; - + PRBool isXPCOM = PR_FALSE; + if (!(mFlags & NS_PLUGIN_FLAG_OLDSCHOOL)) + isXPCOM = PR_TRUE; + if (isXPCOM && !aForceShutdown) return; if (mEntryPoint)