chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shutdown crash in gGraphView (QTBUG-35363)

Browse Source
This commit is contained in:
Mark Watkins 2014-05-16 04:15:32 +10:00
parent f0356ee99c
commit 02de835377
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sleepyhead/Graphs/gGraphView.cpp
View File

@ -297,14 +297,24 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
m_dpr = 1; m_dpr = 1;
#endif #endif
} }
void gGraphView::closeEvent(QCloseEvent * event)
gGraphView::~gGraphView()
{ {
timer->stop(); timer->stop();
redrawtimer->stop(); redrawtimer->stop();
disconnect(redrawtimer, 0, 0, 0); disconnect(redrawtimer, 0, 0, 0);
disconnect(timer, 0, 0, 0); disconnect(timer, 0, 0, 0);
timer->deleteLater();
redrawtimer->deleteLater();
pixmapcache.clear();
if (m_scrollbar) {
this->disconnect(m_scrollbar, SIGNAL(sliderMoved(int)), 0, 0);
}
}
gGraphView::~gGraphView()
{
doneCurrent();
#ifdef ENABLE_THREADED_DRAWING #ifdef ENABLE_THREADED_DRAWING
@ -323,13 +333,6 @@ gGraphView::~gGraphView()
delete m_tooltip; delete m_tooltip;
m_graphs.clear(); m_graphs.clear();
if (m_scrollbar) {
this->disconnect(m_scrollbar, SIGNAL(sliderMoved(int)), 0, 0);
}
delete timer;
delete redrawtimer;
} }
bool gGraphView::usePixmapCache() bool gGraphView::usePixmapCache()

2
sleepyhead/Graphs/gGraphView.h
View File

@ -176,6 +176,8 @@ class gGraphView : public QGLWidget
*/ */
explicit gGraphView(QWidget *parent = 0, gGraphView *shared = 0); explicit gGraphView(QWidget *parent = 0, gGraphView *shared = 0);
virtual ~gGraphView(); virtual ~gGraphView();
virtual void closeEvent(QCloseEvent * event);
//! \brief Add gGraph g to this gGraphView, in the requested graph-linkage group //! \brief Add gGraph g to this gGraphView, in the requested graph-linkage group
void addGraph(gGraph *g, short group = 0); void addGraph(gGraph *g, short group = 0);