dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MainWindow: Fix build on macOS

Browse Source
This commit is contained in:
Jonas Kvinge
2023-08-27 00:09:49 +02:00
parent 50c5283599
commit bc1b45d912
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/mainwindow.cpp
View File

@@ -1067,20 +1067,24 @@ void MainWindow::ReloadSettings() {
QSettings s; QSettings s;
#ifndef Q_OS_MACOS #ifdef Q_OS_MACOS
constexpr bool keeprunning_available = true;
#else
const bool systemtray_available = tray_icon_->IsSystemTrayAvailable();
const bool keeprunning_available = systemtray_available;
s.beginGroup(BehaviourSettingsPage::kSettingsGroup); s.beginGroup(BehaviourSettingsPage::kSettingsGroup);
bool showtrayicon = s.value("showtrayicon", tray_icon_->IsSystemTrayAvailable()).toBool(); const bool showtrayicon = s.value("showtrayicon", systemtray_available).toBool();
s.endGroup(); s.endGroup();
if (tray_icon_->IsSystemTrayAvailable()) { if (systemtray_available) {
tray_icon_->setVisible(showtrayicon); tray_icon_->setVisible(showtrayicon);
} }
if ((!showtrayicon || !tray_icon_->IsSystemTrayAvailable()) && !isVisible()) { if ((!showtrayicon || !systemtray_available) && !isVisible()) {
show(); show();
} }
#endif #endif
s.beginGroup(BehaviourSettingsPage::kSettingsGroup); s.beginGroup(BehaviourSettingsPage::kSettingsGroup);
keep_running_ = showtrayicon && s.value("keeprunning", false).toBool(); keep_running_ = keeprunning_available && s.value("keeprunning", false).toBool();
playing_widget_ = s.value("playing_widget", true).toBool(); playing_widget_ = s.value("playing_widget", true).toBool();
bool trayicon_progress = s.value("trayicon_progress", false).toBool(); bool trayicon_progress = s.value("trayicon_progress", false).toBool();
if (playing_widget_ != ui_->widget_playing->IsEnabled()) TabSwitched(); if (playing_widget_ != ui_->widget_playing->IsEnabled()) TabSwitched();