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

Crash fix for closing calendar or left panel with no profile loaded

Browse Source
This commit is contained in:
Mark Watkins 2018-06-08 13:06:24 +10:00
parent fd6644e382
commit ed491c3919
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sleepyhead/mainwindow.cpp
View File

@ -1639,7 +1639,7 @@ void MainWindow::on_action_Rebuild_Oximetry_Index_triggered()
m->SaveSummaryCache(); m->SaveSummaryCache();
} }
daily->LoadDate(getDaily()->getDate()); daily->LoadDate(daily->getDate());
overview->ReloadGraphs(); overview->ReloadGraphs();
} }
void MainWindow::reloadProfile() void MainWindow::reloadProfile()
@ -1708,8 +1708,9 @@ void MainWindow::RestartApplication(bool force_login, QString cmdline)
void MainWindow::on_actionPurge_Current_Day_triggered() void MainWindow::on_actionPurge_Current_Day_triggered()
{ {
QDate date = getDaily()->getDate(); if (!daily) return;
getDaily()->Unload(date); QDate date = daily->getDate();
daily->Unload(date);
Day *day = p_profile->GetDay(date, MT_CPAP); Day *day = p_profile->GetDay(date, MT_CPAP);
Machine *cpap = nullptr; Machine *cpap = nullptr;
if (day) cpap = day->machine(MT_CPAP); if (day) cpap = day->machine(MT_CPAP);
@ -1785,8 +1786,8 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
day = p_profile->GetDay(date, MT_CPAP); day = p_profile->GetDay(date, MT_CPAP);
Q_UNUSED(day); Q_UNUSED(day);
getDaily()->clearLastDay(); daily->clearLastDay();
getDaily()->LoadDate(date); daily->LoadDate(date);
} }
void MainWindow::on_actionRebuildCPAP(QAction *action) void MainWindow::on_actionRebuildCPAP(QAction *action)
@ -2350,14 +2351,14 @@ void MainWindow::on_reportModeRange_clicked()
void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered() void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered()
{ {
if (!getDaily()) if (!daily)
return; return;
QDate date = getDaily()->getDate(); QDate date = daily->getDate();
Day * day = p_profile->GetDay(date, MT_OXIMETER); Day * day = p_profile->GetDay(date, MT_OXIMETER);
if (day) { if (day) {
if (QMessageBox::question(this, STR_MessageBox_Warning, if (QMessageBox::question(this, STR_MessageBox_Warning,
tr("Are you sure you want to delete oximetry data for %1"). tr("Are you sure you want to delete oximetry data for %1").
arg(getDaily()->getDate().toString(Qt::DefaultLocaleLongDate))+"<br/><br/>"+ arg(daily->getDate().toString(Qt::DefaultLocaleLongDate))+"<br/><br/>"+
tr("<b>Please be aware you can not undo this operation!</b>"), tr("<b>Please be aware you can not undo this operation!</b>"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) { QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
return; return;
@ -2393,21 +2394,21 @@ void MainWindow::on_importButton_clicked()
void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b) void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b)
{ {
AppSetting->setLineCursorMode(b); AppSetting->setLineCursorMode(b);
if (ui->tabWidget->currentWidget() == getDaily()) { if (ui->tabWidget->currentWidget() == daily) {
getDaily()->graphView()->timedRedraw(0); daily->graphView()->timedRedraw(0);
} else if (ui->tabWidget->currentWidget() == getOverview()) { } else if (ui->tabWidget->currentWidget() == overview) {
getOverview()->graphView()->timedRedraw(0); overview->graphView()->timedRedraw(0);
} }
} }
void MainWindow::on_actionLeft_Daily_Sidebar_toggled(bool visible) void MainWindow::on_actionLeft_Daily_Sidebar_toggled(bool visible)
{ {
getDaily()->setSidebarVisible(visible); if (daily) daily->setSidebarVisible(visible);
} }
void MainWindow::on_actionDaily_Calendar_toggled(bool visible) void MainWindow::on_actionDaily_Calendar_toggled(bool visible)
{ {
getDaily()->setCalendarVisible(visible); if (daily) daily->setCalendarVisible(visible);
} }
#include "SleepLib/journal.h" #include "SleepLib/journal.h"

5
sleepyhead/sleepyhead.pro
View File

@ -4,13 +4,12 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui network xml printsupport serialport widgets help
lessThan(QT_MAJOR_VERSION,5) { lessThan(QT_MAJOR_VERSION,5) {
error("Sorry, need Qt 5 to build SleepyHead"); error("Sorry, need Qt 5 to build SleepyHead");
} }
QT += core gui network xml printsupport serialport widgets help
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS
#SleepyHead requires OpenGL 2.0 support to run smoothly #SleepyHead requires OpenGL 2.0 support to run smoothly