From: Braden M. <br...@us...> - 2007-04-27 06:58:27
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22336/src/libopenvrml/openvrml Modified Files: Tag: OpenVRML-0_16-BRANCH browser.cpp Log Message: Check to make sure we have a root scene thread before joining it. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.190.2.14 retrieving revision 1.190.2.15 diff -C2 -d -r1.190.2.14 -r1.190.2.15 *** browser.cpp 16 Apr 2007 08:18:15 -0000 1.190.2.14 --- browser.cpp 27 Apr 2007 06:58:26 -0000 1.190.2.15 *************** *** 5538,5542 **** openvrml::browser::~browser() OPENVRML_NOTHROW { ! this->load_root_scene_thread_->join(); this->load_proto_thread_group_.join_all(); --- 5538,5544 ---- openvrml::browser::~browser() OPENVRML_NOTHROW { ! if (this->load_root_scene_thread_) { ! this->load_root_scene_thread_->join(); ! } this->load_proto_thread_group_.join_all(); |