diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp
index d14c3135..698bae50 100644
--- a/sleepyhead/Graphs/gGraphView.cpp
+++ b/sleepyhead/Graphs/gGraphView.cpp
@@ -297,14 +297,24 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
     m_dpr = 1;
 #endif
 }
-
-gGraphView::~gGraphView()
+void gGraphView::closeEvent(QCloseEvent * event)
 {
     timer->stop();
     redrawtimer->stop();
-
     disconnect(redrawtimer, 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
 
@@ -323,13 +333,6 @@ gGraphView::~gGraphView()
 
     delete m_tooltip;
     m_graphs.clear();
-
-    if (m_scrollbar) {
-        this->disconnect(m_scrollbar, SIGNAL(sliderMoved(int)), 0, 0);
-    }
-
-    delete timer;
-    delete redrawtimer;
 }
 
 bool gGraphView::usePixmapCache()
diff --git a/sleepyhead/Graphs/gGraphView.h b/sleepyhead/Graphs/gGraphView.h
index 33802398..dd6211d9 100644
--- a/sleepyhead/Graphs/gGraphView.h
+++ b/sleepyhead/Graphs/gGraphView.h
@@ -176,6 +176,8 @@ class gGraphView : public QGLWidget
         */
     explicit gGraphView(QWidget *parent = 0, gGraphView *shared = 0);
     virtual ~gGraphView();
+    virtual void closeEvent(QCloseEvent * event);
+
 
     //! \brief Add gGraph g to this gGraphView, in the requested graph-linkage group
     void addGraph(gGraph *g, short group = 0);