From c60b5e7b6e4b18d38cbda0c828de1e1e96137233 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sun, 20 Dec 2009 18:59:18 +0000
Subject: [PATCH] minor refinement

---
 direct/src/plugin/p3dInstance.cxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/direct/src/plugin/p3dInstance.cxx b/direct/src/plugin/p3dInstance.cxx
index 3e340b28e3..4402bcbbbb 100644
--- a/direct/src/plugin/p3dInstance.cxx
+++ b/direct/src/plugin/p3dInstance.cxx
@@ -1356,7 +1356,10 @@ uninstall_packages() {
   Packages::const_iterator pi;
   for (pi = _packages.begin(); pi != _packages.end(); ++pi) {
     P3DPackage *package = (*pi);
-    package->uninstall();
+    if (package != _image_package && package != _certlist_package &&
+        package != _p3dcert_package) {
+      package->uninstall();
+    }
   }
 }
 
@@ -1372,12 +1375,17 @@ uninstall_packages() {
 ////////////////////////////////////////////////////////////////////
 void P3DInstance::
 uninstall_host() {
+  uninstall_packages();
+
   set<P3DHost *> hosts;
 
   Packages::const_iterator pi;
   for (pi = _packages.begin(); pi != _packages.end(); ++pi) {
     P3DPackage *package = (*pi);
-    hosts.insert(package->get_host());
+    if (package != _image_package && package != _certlist_package &&
+        package != _p3dcert_package) {
+      hosts.insert(package->get_host());
+    }
   }
 
   set<P3DHost *>::iterator hi;