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

Fix Crash during change of high resolution checkbox

Browse Source
This commit is contained in:
LoudSnorer 2024-07-10 13:00:21 -04:00
parent c4c0bf5596
commit f2fd17f68f
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oscar/main.cpp
View File

@ -401,7 +401,7 @@ int main(int argc, char *argv[]) {
for (int i = 1; i < args.size(); i++) { for (int i = 1; i < args.size(); i++) {
if ((args[i] == "--language") || (args[i] == "--l") ) { if ((args[i] == "--language") || (args[i] == "--l") ) {
settings.setValue(LangSetting,""); settings.setValue(LangSetting,"");
} else if ( (args[i] == "-l") || (args[i] == "-nop")){ } else if ( (args[i] == "-l") || (args[i] == "-nop") || (args[i] == "") ){
// do nothing. internal calls that current don't have any functions in main. // do nothing. internal calls that current don't have any functions in main.
} else if (args[i] == "-p") { } else if (args[i] == "-p") {
QThread::msleep(1000); QThread::msleep(1000);
@ -409,7 +409,8 @@ int main(int argc, char *argv[]) {
if ((i+1) < args.size()) if ((i+1) < args.size())
load_profile = args[++i]; load_profile = args[++i];
else { else {
optionExit(1,"Missing argument to --profile"); // Just view all profiles.
load_profile = " ";
} }
} else if (args[i] == "--datadir") { // mltam's idea } else if (args[i] == "--datadir") { // mltam's idea
QString datadir, datadirwas ; QString datadir, datadirwas ;
@ -435,7 +436,7 @@ int main(int argc, char *argv[]) {
} else if (QString(args[i]).contains("help",Qt::CaseInsensitive)) { } else if (QString(args[i]).contains("help",Qt::CaseInsensitive)) {
optionExit(0,QString("")); optionExit(0,QString(""));
} else { } else {
optionExit(3,QString("Invalid Argument. %1").arg(args[i])); optionExit(3,QString("Invalid Argument: '%1'").arg(args[i]));
} }
} // end of for args loop } // end of for args loop

1
oscar/mainwindow.cpp
View File

@ -1644,6 +1644,7 @@ void MainWindow::reloadProfile()
void MainWindow::RestartApplication(bool force_login, QString cmdline) void MainWindow::RestartApplication(bool force_login, QString cmdline)
{ {
qDebug() << "Restarting OSCAR";
CloseProfile(); CloseProfile();
p_pref->Save(); p_pref->Save();

16
oscar/mainwindow.h
View File

@ -138,14 +138,6 @@ class MainWindow : public QMainWindow
void updateOverview(); void updateOverview();
/*! \fn void RestartApplication(bool force_login=false);
\brief Closes down OSCAR and restarts it
\param bool force_login
If force_login is set, it will return to the login menu even if it's set to skip
*/
void RestartApplication(bool force_login = false, QString cmdline = QString());
void JumpDaily(); void JumpDaily();
void JumpOverview(); void JumpOverview();
void JumpStatistics(); void JumpStatistics();
@ -179,6 +171,14 @@ class MainWindow : public QMainWindow
//! \brief Recalculate all event summaries and flags //! \brief Recalculate all event summaries and flags
void doReprocessEvents(); void doReprocessEvents();
void doRecompressEvents(); void doRecompressEvents();
/*! \fn void RestartApplication(bool force_login=false);
\brief Closes down OSCAR and restarts it
\param bool force_login
If force_login is set, it will return to the login menu even if it's set to skip
allow timer to restart application.
*/
void RestartApplication(bool force_login = false, QString cmdline = QString());
protected: protected:

6
oscar/preferencesdialog.cpp
View File

@ -868,7 +868,11 @@ bool PreferencesDialog::Save()
bool clicicalModeChanged = profile->cpap->clinicalMode() != ui->clinicalMode->isChecked() ; bool clicicalModeChanged = profile->cpap->clinicalMode() != ui->clinicalMode->isChecked() ;
p_profile->cpap->setClinicalMode(ui->clinicalMode->isChecked()); p_profile->cpap->setClinicalMode(ui->clinicalMode->isChecked());
needs_restart |= HighResolution::checkBox(true,ui->highResolution); if (HighResolution::checkBox(true,ui->highResolution) ) {
//needs_restart = true;
QTimer::singleShot(0, mainwin, SLOT(RestartApplication(true, "-p")));
return true; // save profile
}
if (ui->alternatingColorsCombo->currentIndex() != AppSetting->alternatingColorsCombo()) { if (ui->alternatingColorsCombo->currentIndex() != AppSetting->alternatingColorsCombo()) {
AppSetting->setAlternatingColorsCombo(ui->alternatingColorsCombo->currentIndex()); AppSetting->setAlternatingColorsCombo(ui->alternatingColorsCombo->currentIndex());