Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions omodsim/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ MainWindow::MainWindow(bool useSession, QWidget *parent)
connect(&_mbMultiServer, &ModbusMultiServer::connectionError, this, &MainWindow::on_connectionError);

if(_useSession) {
loadSettings();

if(_windowCounter == 0) {
if(!loadSettings()) {
ui->actionNew->trigger();
}
}
Expand Down Expand Up @@ -1848,7 +1846,7 @@ void MainWindow::closeMdiChild(FormModSim* frm)
///
/// \brief MainWindow::loadSettings
///
void MainWindow::loadSettings()
bool MainWindow::loadSettings()
{
const auto filename = QString("%1.ini").arg(QFileInfo(qApp->applicationFilePath()).baseName());
auto filepath = QString("%1%2%3").arg(qApp->applicationDirPath(), QDir::separator(), filename);
Expand All @@ -1857,7 +1855,7 @@ void MainWindow::loadSettings()
filepath = QString("%1%2%3").arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation),
QDir::separator(), filename);

if(!QFile::exists(filepath)) return;
if(!QFile::exists(filepath)) return false;

QSettings m(filepath, QSettings::IniFormat, this);

Expand Down Expand Up @@ -1920,6 +1918,8 @@ void MainWindow::loadSettings()
}

restoreState(m.value("WindowState").toByteArray());

return true;
}

///
Expand Down
2 changes: 1 addition & 1 deletion omodsim/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ private slots:
void saveMdiChild(FormModSim* frm, SerializationFormat format);
void closeMdiChild(FormModSim* frm);

void loadSettings();
bool loadSettings();
void saveSettings();

void saveAs(FormModSim* frm, SerializationFormat format);
Expand Down