From 181335ad2341261ab5e86dfb4a476f2f978f8aaa Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Tue, 17 Jul 2001 19:55:33 +0000 Subject: [PATCH] bug=88053 r=peterl approval=selmer After testing real and java on win32 and linux, we're satisfied that this works. Checking in to trunk. Already on branch. git-svn-id: svn://10.0.0.236/trunk@99427 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp | 3 ++- mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index a63ef238700..334f5ed94e2 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -880,7 +880,8 @@ void nsPluginTag::TryUnloadPlugin(PRBool aForceShutdown) } // before we unload check if we are allowed to, see bug #61388 - if (mLibrary && mCanUnloadLibrary) + // also, never unload an XPCOM plugin library + if (mLibrary && mCanUnloadLibrary && !isXPCOM) PR_UnloadLibrary(mLibrary); // we should zero it anyway, it is going to be unloaded by diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index a63ef238700..334f5ed94e2 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -880,7 +880,8 @@ void nsPluginTag::TryUnloadPlugin(PRBool aForceShutdown) } // before we unload check if we are allowed to, see bug #61388 - if (mLibrary && mCanUnloadLibrary) + // also, never unload an XPCOM plugin library + if (mLibrary && mCanUnloadLibrary && !isXPCOM) PR_UnloadLibrary(mLibrary); // we should zero it anyway, it is going to be unloaded by