RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid hangup when installing packages

This commit is contained in:
David Rose 2010-04-28 01:09:59 +00:00
parent e5751db70a
commit eabeb00298
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,7 @@ P3DInstance(P3D_request_ready_func *func,
_download_package_index = 0;
_total_download_size = 0;
_total_downloaded = 0;
_packages_specified = false;
_download_started = false;
_download_complete = false;
_instance_started = false;
@ -1114,6 +1115,11 @@ remove_package(P3DPackage *package) {
////////////////////////////////////////////////////////////////////
bool P3DInstance::
get_packages_info_ready() const {
if (!_packages_specified) {
// We haven't even specified the full set of required packages yet.
return false;
}
Packages::const_iterator pi;
for (pi = _packages.begin(); pi != _packages.end(); ++pi) {
if (!(*pi)->get_info_ready()) {
@ -2074,6 +2080,8 @@ scan_app_desc_file(TiXmlDocument *doc) {
////////////////////////////////////////////////////////////////////
void P3DInstance::
add_packages() {
assert(!_packages_specified);
P3DInstanceManager *inst_mgr = P3DInstanceManager::get_global_ptr();
TiXmlElement *xrequires = _xpackage->FirstChildElement("requires");
@ -2091,6 +2099,23 @@ add_packages() {
xrequires = xrequires->NextSiblingElement("requires");
}
_packages_specified = true;
if (get_packages_info_ready()) {
// All packages are ready to go. Let's start some download
// action.
_downloading_packages.clear();
_total_download_size = 0;
Packages::const_iterator pi;
for (pi = _packages.begin(); pi != _packages.end(); ++pi) {
P3DPackage *package = (*pi);
if (package->get_info_ready() && !package->get_ready()) {
_downloading_packages.push_back(package);
_total_download_size += package->get_download_size();
}
}
ready_to_install();
}
}

1
direct/src/plugin/p3dInstance.h
View File

@ -349,6 +349,7 @@ private:
int _download_package_index;
size_t _total_download_size;
size_t _total_downloaded;
bool _packages_specified;
bool _download_started;
bool _download_complete;
bool _instance_started;