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

framework: fix pview crash when exit is called inside render_frame

Browse Source 
This can happen when a system event (eg. on macOS) triggers a terminate from within process_events.

This is a workaround for a common error; the proper fix is not to put PandaFramework in the global scope.
This commit is contained in:
rdb 2018-03-29 14:11:21 +02:00
parent 4eb250cb87
commit 63b1e44977
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/framework/pandaFramework.cxx
View File

@ -1391,11 +1391,17 @@ AsyncTask::DoneStatus PandaFramework::
task_igloop(GenericAsyncTask *task, void *data) { task_igloop(GenericAsyncTask *task, void *data) {
PandaFramework *self = (PandaFramework *)data; PandaFramework *self = (PandaFramework *)data;
if (self->_engine != (GraphicsEngine *)NULL) { // This exists to work around a crash that happens when the PandaFramework
self->_engine->render_frame(); // is destructed because the application is exited during render_frame().
// The proper fix is not to instantiate PandaFramework in the global scope
// but many C++ applications (including pview) do this anyway.
PT(GraphicsEngine) engine = self->_engine;
if (engine != nullptr) {
engine->render_frame();
return AsyncTask::DS_cont;
} else {
return AsyncTask::DS_done;
} }
return AsyncTask::DS_cont;
} }
/** /**