tempo-plotter Changeset - eec08765e920 · protofusion repositories

Changeset - eec08765e920

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-07-24 00:03:29
hy@ozderya.net

fix segmentation fault when closing application

2 files changed with 4 insertions and 2 deletions:

main.cpp

mainwindow.cpp

0 comments (0 inline, 0 general)

main.cpp

➞

Show inline comments

@@ @@ -19,24 +19,25 @@ @@
 #include "mainwindow.h"
 #include <QApplication>
 #include <QtGlobal>
 #include "version.h"
 MainWindow* pMainWindow;
 void messageHandler(QtMsgType type, const QMessageLogContext &context,
                     const QString &msg)
+{
     // TODO: don't call MainWindow::messageHandler if window is destroyed
     pMainWindow->messageHandler(type, context, msg);
+}
 int main(int argc, char *argv[])
+{
     QApplication a(argc, argv);
     MainWindow w;
     pMainWindow = &w;
     qInstallMessageHandler(messageHandler);
     // log application information

mainwindow.cpp

➞

Show inline comments

@@ @@ -183,24 +183,25 @@ MainWindow::MainWindow(QWidget *parent) @@
 MainWindow::~MainWindow()
+{
     for (auto curve : curves)
+    {
         delete curve;
+    }
     if (serialPort.isOpen())
+    {
         serialPort.close();
+    }
     delete ui;
     ui = NULL; // we check if ui is deleted in messageHandler
+}
 void MainWindow::setupAboutDialog()
+{
     Ui_AboutDialog uiAboutDialog;
     uiAboutDialog.setupUi(&aboutDialog);
     QObject::connect(uiAboutDialog.pbAboutQt, &QPushButton::clicked,
                      [](){ QApplication::aboutQt();});
     QString aboutText = uiAboutDialog.lbAbout->text();
     aboutText.replace("$VERSION_STRING$", VERSION_STRING);
@@ @@ -719,28 +720,28 @@ void MainWindow::messageHandler(QtMsgTyp @@
             break;
         case QtWarningMsg:
             logString = "[Warning] " + msg;
             break;
         case QtCriticalMsg:
             logString = "[Error] " + msg;
             break;
         case QtFatalMsg:
             logString = "[Fatal] " + msg;
             break;
+    }
     ui->ptLog->appendPlainText(logString);
+    if (ui != NULL) ui->ptLog->appendPlainText(logString);
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg)
+    if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}
 void MainWindow::unzoomed()
+{
     if (ui->cbAutoScale->isChecked())
+    {
         ui->plot->setAxisAutoScale(QwtPlot::yLeft);
+    }
     else

0 comments (0 inline, 0 general)