From 10e44278602ef34e4e5cd2a8c9ae47cd57231ce6 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 19 Oct 2009 22:29:39 +0000
Subject: [PATCH] fix firefox crash

---
 direct/src/plugin/p3dInstance.cxx      | 6 ++++++
 direct/src/plugin_npapi/ppInstance.cxx | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/direct/src/plugin/p3dInstance.cxx b/direct/src/plugin/p3dInstance.cxx
index 1c5cd4eefe..d5e51ef1b8 100644
--- a/direct/src/plugin/p3dInstance.cxx
+++ b/direct/src/plugin/p3dInstance.cxx
@@ -359,6 +359,12 @@ make_p3d_stream(const string &p3d_url) {
 ////////////////////////////////////////////////////////////////////
 void P3DInstance::
 set_p3d_filename(const string &p3d_filename) {
+  if (!_fparams.get_p3d_filename().empty()) {
+    nout << "p3d_filename already set to: " << _fparams.get_p3d_filename()
+         << ", trying to set to " << p3d_filename << "\n";
+    return;
+  }
+
   _fparams.set_p3d_filename(p3d_filename);
   _got_fparams = true;
 
diff --git a/direct/src/plugin_npapi/ppInstance.cxx b/direct/src/plugin_npapi/ppInstance.cxx
index 2f3f9d8a1f..9fce5d55ba 100644
--- a/direct/src/plugin_npapi/ppInstance.cxx
+++ b/direct/src/plugin_npapi/ppInstance.cxx
@@ -258,6 +258,7 @@ write_ready(NPStream *stream) {
       // instance.
       assert(_got_instance_url);
       int user_id = P3D_instance_start_stream(_p3d_inst, _instance_url.c_str());
+      nout << "Got p3d instance to stream " << user_id << "\n";
       req->_rtype = PPDownloadRequest::RT_user;
       req->_user_id = user_id;
     }
@@ -1196,10 +1197,6 @@ create_instance() {
       _script_object->set_main(main);
     }
 
-    if (_got_instance_url) {
-      P3D_instance_start(_p3d_inst, false, _instance_url.c_str());
-    }
-
     if (_got_window) {
       send_window();
     }