1 files changed, 11 insertions, 0 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 9c9aff7569..4698b3fc58 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -102,6 +102,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
     connect(ui.action_About, SIGNAL(triggered()), this, SLOT(about()));
     connect(ui.action_Help, SIGNAL(triggered()), this, SLOT(help()));
     connect(ui.action_Configure, SIGNAL(triggered()), this, SLOT(configDialog()));
+    connect(ui.actionE_xit, SIGNAL(triggered()), this, SLOT(shutdown()));
     connect(ui.buttonChangeDevice, SIGNAL(clicked()), this, SLOT(configDialog()));
     connect(ui.buttonRockbox, SIGNAL(clicked()), this, SLOT(installBtn()));
     connect(ui.buttonBootloader, SIGNAL(clicked()), this, SLOT(installBootloaderBtn()));
@@ -142,6 +143,16 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
 }
 
 
+void RbUtilQt::shutdown(void)
+{
+    // restore default message handler to prevent trace accesses during
+    // object destruction -- the trace object could already be destroyed.
+    // Fixes segfaults on exit.
+    qInstallMsgHandler(0);
+    this->close();
+}
+
+
 void RbUtilQt::trace(void)
 {
     SysTrace wnd(this);