From d452b4dbf633efb42b8b2c84f664b7186259eb1f Mon Sep 17 00:00:00 2001 From: David Rose Date: Sun, 28 Dec 2008 20:04:50 +0000 Subject: [PATCH] fix runaway controls task --- panda/src/framework/windowFramework.cxx | 5 ++++- panda/src/framework/windowFramework.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/panda/src/framework/windowFramework.cxx b/panda/src/framework/windowFramework.cxx index 30dc58e5fc..9fcde9dc79 100644 --- a/panda/src/framework/windowFramework.cxx +++ b/panda/src/framework/windowFramework.cxx @@ -1302,7 +1302,8 @@ create_anim_controls() { setup_shuttle_button("4", 2, st_play_button); setup_shuttle_button(":", 3, st_forward_button); - _panda_framework->get_task_mgr().add(new GenericAsyncTask("controls", st_update_anim_controls, (void *)this)); + _update_anim_controls_task = new GenericAsyncTask("controls", st_update_anim_controls, (void *)this); + _panda_framework->get_task_mgr().add(_update_anim_controls_task); } //////////////////////////////////////////////////////////////////// @@ -1316,6 +1317,8 @@ destroy_anim_controls() { _anim_controls_group.remove_node(); _panda_framework->get_event_handler().remove_hooks_with((void *)this); + _panda_framework->get_task_mgr().remove(_update_anim_controls_task); + _update_anim_controls_task.clear(); } } diff --git a/panda/src/framework/windowFramework.h b/panda/src/framework/windowFramework.h index a0d695c8f5..9f35581bcb 100644 --- a/panda/src/framework/windowFramework.h +++ b/panda/src/framework/windowFramework.h @@ -175,6 +175,7 @@ private: PT(PGSliderBar) _anim_slider; PT(PGSliderBar) _play_rate_slider; PT(TextNode) _frame_number; + PT(GenericAsyncTask) _update_anim_controls_task; NodePath _mouse; PT(Trackball) _trackball;