Skip to content

Add nullptr checks for system tray. #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HenryMiller1 merged 1 commit into from
Dec 7, 2025
Merged

Add nullptr checks for system tray. #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions src/mainwindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ MainWindow::~MainWindow()

void MainWindow::closeEvent(QCloseEvent *e)
{
if (m_systemTrayIcon->isVisible())
if (m_systemTrayIcon && m_systemTrayIcon->isVisible())
{
QSettings settings;
const bool shownBefore = settings.value(QStringLiteral("programWillKeepRunningWarningShown")).toBool();
Expand Down Expand Up @@ -216,7 +216,10 @@ void MainWindow::writeSettings()
QSettings settings;
settings.setValue(QStringLiteral("geometry"), saveGeometry());
settings.setValue(QStringLiteral("windowState"), saveState());
settings.setValue(QStringLiteral("showSystemTray"), m_systemTrayIcon->isVisible());
if (m_systemTrayIcon)
{
settings.setValue(QStringLiteral("showSystemTray"), m_systemTrayIcon->isVisible());
}
settings.setValue(QStringLiteral("currentView"), (m_view ? m_view->id() : QString()));
settings.sync();
}
Expand Down Expand Up @@ -299,6 +302,10 @@ void MainWindow::configureView()

void MainWindow::updateSystemTrayVisible()
{
if (!m_systemTrayIcon)
{
return;
}
if (m_showInSystemTrayAction->isChecked()) {
m_systemTrayIcon->show();
} else {
Expand Down Expand Up @@ -394,7 +401,10 @@ void MainWindow::updateJobStats()
if (!m_monitor->schedulerState()) {
m_jobStatsWidget->clear();
m_jobStatsWidget->setVisible(false);
m_systemTrayIcon->setToolTip(tr("Scheduler is offline."));
if (m_systemTrayIcon)
{
m_systemTrayIcon->setToolTip(tr("Scheduler is offline."));
}
return;
}

Expand Down Expand Up @@ -445,7 +455,10 @@ void MainWindow::updateJobStats()

m_jobStatsWidget->setText(tr("| Active jobs: %1").arg(text));
m_jobStatsWidget->setVisible(true);
m_systemTrayIcon->setToolTip(tr("Active jobs: %1").arg(textNoHTML));
if (m_systemTrayIcon)
{
m_systemTrayIcon->setToolTip(tr("Active jobs: %1").arg(textNoHTML));
}
}

void MainWindow::setCurrentNet(const QByteArray &netname)
Expand Down