From 5f0febd8e89a3e4ab1f276b177160ea7a64701e1 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 9 Mar 2006 19:19:12 +0000 Subject: [PATCH] clear frameRateMeter on window close --- direct/src/showbase/ShowBase.py | 4 +++- panda/src/framework/windowFramework.cxx | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index eefaf01e4d..094828414e 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -478,7 +478,9 @@ class ShowBase(DirectObject.DirectObject): if win == self.win: self.win = None - self.frameRateMeter = None + if self.frameRateMeter: + self.frameRateMeter.clearWindow() + self.frameRateMeter = None def openDefaultWindow(self): # Creates the main window for the first time, without being diff --git a/panda/src/framework/windowFramework.cxx b/panda/src/framework/windowFramework.cxx index d506fefaaf..af7e38776c 100644 --- a/panda/src/framework/windowFramework.cxx +++ b/panda/src/framework/windowFramework.cxx @@ -228,7 +228,10 @@ close_window() { _one_sided_reverse_enabled = false; _lighting_enabled = false; - _frame_rate_meter = (FrameRateMeter *)NULL; + if (_frame_rate_meter != (FrameRateMeter *)NULL) { + _frame_rate_meter->clear_window(); + _frame_rate_meter = (FrameRateMeter *)NULL; + } } ////////////////////////////////////////////////////////////////////