Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-29 02:39:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4408 from birarda/master

Browse source 
let QMainWindow delete GLCanvas, just stop the QTimer instead
This commit is contained in:
Brad Hefta-Gaub 2015-03-10 13:41:36 -07:00
commit d59f9c85a3
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -604,8 +604,8 @@ Application::~Application() {
ModelEntityItem::cleanupLoadedAnimations(); ModelEntityItem::cleanupLoadedAnimations();
delete _glWidget; // stop the glWidget frame timer so it doesn't call paintGL
_glWidget = NULL; _glWidget->stopFrameTimer();
DependencyManager::destroy<AnimationCache>(); DependencyManager::destroy<AnimationCache>();
DependencyManager::destroy<TextureCache>(); DependencyManager::destroy<TextureCache>();

4
interface/src/GLCanvas.cpp
View file

@ -31,6 +31,10 @@ GLCanvas::GLCanvas() : QGLWidget(QGL::NoDepthBuffer | QGL::NoStencilBuffer),
#endif #endif
} }
void GLCanvas::stopFrameTimer() {
_frameTimer.stop();
}
bool GLCanvas::isThrottleRendering() const { bool GLCanvas::isThrottleRendering() const {
return _throttleRendering || Application::getInstance()->getWindow()->isMinimized(); return _throttleRendering || Application::getInstance()->getWindow()->isMinimized();
} }

2
interface/src/GLCanvas.h
View file

@ -22,6 +22,8 @@ class GLCanvas : public QGLWidget {
public: public:
GLCanvas(); GLCanvas();
void stopFrameTimer();
bool isThrottleRendering() const; bool isThrottleRendering() const;