diff --git a/CMakeLists.txt b/CMakeLists.txt index 824071a34..02fc06768 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ set(APP_AUTHOR "Martin Rotter") set(APP_COPYRIGHT "\\251 2011-${YEAR} ${APP_AUTHOR}") set(APP_REVERSE_NAME "io.github.martinrotter.rssguard") set(APP_DONATE_URL "https://github.com/sponsors/martinrotter") -set(APP_VERSION "4.2.7") +set(APP_VERSION "4.3.0") set(APP_URL "https://github.com/martinrotter/rssguard") set(APP_URL_DOCUMENTATION "https://github.com/martinrotter/rssguard/blob/${APP_VERSION}/resources/docs/Documentation.md") diff --git a/src/librssguard/core/feeddownloader.cpp b/src/librssguard/core/feeddownloader.cpp index 77cc6c82c..02b683622 100644 --- a/src/librssguard/core/feeddownloader.cpp +++ b/src/librssguard/core/feeddownloader.cpp @@ -434,6 +434,7 @@ void FeedDownloader::finalizeUpdate() { << QUOTE_W_SPACE_DOT(QThread::currentThreadId()); m_results.sort(); + m_feeds.clear(); // Update of feeds has finished. // NOTE: This means that now "update lock" can be unlocked diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index dec825cfd..59660aedf 100644 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -317,7 +317,7 @@ #define OS_ID "OpenBSD" #elif defined(Q_OS_OS2) #define OS_ID "OS2" -#elif defined(Q_OS_OSX) +#elif defined(Q_OS_MACOS) #define OS_ID "macOS" #elif defined(Q_OS_WIN) #define OS_ID "Windows" diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index 5c3b42c98..d563af6a0 100644 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -267,6 +267,7 @@ void FormMain::prepareMenus() { if (QSysInfo::currentCpuArchitecture().contains(QSL("arm"), Qt::CaseSensitivity::CaseInsensitive)) { qWarningNN << LOGSEC_GUI << "Disabling native menu bar."; m_ui->m_menuBar->setNativeMenuBar(false); + #if defined(Q_OS_MACOS) // This works around a macOS-only Qt crash. // QTBUG: https://bugreports.qt.io/browse/QTBUG-102107