TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor refinement

Browse Source
This commit is contained in:
David Rose 2009-12-20 18:59:18 +00:00
parent fd6e2fc82a
commit c60b5e7b6e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
direct/src/plugin/p3dInstance.cxx
View File

@ -1356,9 +1356,12 @@ uninstall_packages() {
Packages::const_iterator pi; Packages::const_iterator pi;
for (pi = _packages.begin(); pi != _packages.end(); ++pi) { for (pi = _packages.begin(); pi != _packages.end(); ++pi) {
P3DPackage *package = (*pi); P3DPackage *package = (*pi);
if (package != _image_package && package != _certlist_package &&
package != _p3dcert_package) {
package->uninstall(); package->uninstall();
} }
} }
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: P3DInstance::uninstall_host // Function: P3DInstance::uninstall_host
@ -1372,13 +1375,18 @@ uninstall_packages() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DInstance:: void P3DInstance::
uninstall_host() { uninstall_host() {
uninstall_packages();
set<P3DHost *> hosts; set<P3DHost *> hosts;
Packages::const_iterator pi; Packages::const_iterator pi;
for (pi = _packages.begin(); pi != _packages.end(); ++pi) { for (pi = _packages.begin(); pi != _packages.end(); ++pi) {
P3DPackage *package = (*pi); P3DPackage *package = (*pi);
if (package != _image_package && package != _certlist_package &&
package != _p3dcert_package) {
hosts.insert(package->get_host()); hosts.insert(package->get_host());
} }
}
set<P3DHost *>::iterator hi; set<P3DHost *>::iterator hi;
for (hi = hosts.begin(); hi != hosts.end(); ++hi) { for (hi = hosts.begin(); hi != hosts.end(); ++hi) {