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

Really try and fix shutdown crash

Browse Source
This commit is contained in:
Mark Watkins 2018-04-26 00:30:43 +10:00
parent 90d5cadc0c
commit 826322ff86
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sleepyhead/mainwindow.cpp
View File

@ -236,9 +236,6 @@ MainWindow::MainWindow(QWidget *parent) :
qsrand(QDateTime::currentDateTime().toTime_t());
// Setup to run a few last minute things before shutdown.
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit()));
QList<int> a;
int panel_width = AppSetting->rightPanelWidth();
@ -254,24 +251,19 @@ void MainWindow::logMessage(QString msg)
ui->logText->appendPlainText(msg);
}
void MainWindow::on_aboutToQuit()
{
if (systraymenu) delete systraymenu;
}
void MainWindow::closeEvent(QCloseEvent * event)
{
schema::channel.Save();
if (p_profile) {
CloseProfile();
}
if (AppSetting->removeCardReminder()) {
Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("SleepyHead Reminder"));
QApplication::processEvents();
QThread::msleep(1000);
}
schema::channel.Save();
if (p_profile) {
CloseProfile();
}
// Shutdown and Save the current User profile
Profiles::Done();
@ -285,13 +277,11 @@ void MainWindow::closeEvent(QCloseEvent * event)
extern MainWindow *mainwin;
MainWindow::~MainWindow()
{
// if (systraymenu) { delete systraymenu; }
// if (systray) { delete systray; }
// Trash anything allocated by the Graph objects
DestroyGraphGlobals();
if (systraymenu) delete systraymenu;
disconnect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString)));
shutdownLogger();
@ -613,10 +603,6 @@ int MainWindow::importCPAP(ImportPath import, const QString &message)
ui->tabWidget->setCurrentIndex(AppSetting->openTabAfterImport());
}
// Now what was this for???
disconnect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit()));
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit()));
return c;
}

1
sleepyhead/mainwindow.h
View File

@ -326,7 +326,6 @@ class MainWindow : public QMainWindow
void on_actionExport_Journal_triggered();
void on_actionShow_Performance_Counters_toggled(bool arg1);
void on_aboutToQuit();
void on_actionExport_CSV_triggered();