From 46751b1cc4c6b30b5f0b8a45d8e6cb28681f455d Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 22 Dec 2009 03:15:55 +0000
Subject: [PATCH] don't fail too early due to p3dcert

---
 direct/src/plugin/p3dInstance.cxx | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/direct/src/plugin/p3dInstance.cxx b/direct/src/plugin/p3dInstance.cxx
index 6a22433941..831ab53c4e 100644
--- a/direct/src/plugin/p3dInstance.cxx
+++ b/direct/src/plugin/p3dInstance.cxx
@@ -1743,6 +1743,12 @@ mark_p3d_untrusted() {
     return;
   }
 
+  if (_p3dcert_package->get_failed()) {
+    // Oh, too bad for us.  We're dependent on this package which we
+    // weren't able to download for some reason.
+    set_failed();
+  }
+
   if (!_p3dcert_package->get_ready()) {
     // Wait for it to finish downloading.
     return;
@@ -2982,14 +2988,7 @@ report_package_done(P3DPackage *package, bool success) {
       _splash_window->set_install_progress(0.0, true, 0);
     }
     set_install_label("");
-  
-    if (success) {
-      mark_p3d_untrusted();
-    } else if (!_p3d_trusted) {
-      // Oops, too bad.  Couldn't get the p3dcert package, which means
-      // we can't approve the instance.
-      set_failed();
-    }
+    mark_p3d_untrusted();
     return;
   }