fix some build errors

CMakeLists.txt

@@ -154,6 +154,10 @@ if(NOT OS2)
   list(APPEND QT_COMPONENTS Multimedia)
 endif()
 
+if(ENABLE_MEDIAPLAYER_QTMULTIMEDIA AND ENABLE_MEDIAPLAYER_LIBMPV)
+  message(FATAL_ERROR "You can only enable 1 media player backend.")
+endif()
+
 if(ENABLE_MEDIAPLAYER_QTMULTIMEDIA)
   message(STATUS "Enabling QtMultimedia media player backend.")
 

resources/text/CHANGELOG

@@ -1,3 +1,9 @@
+4.6.1
+-----
+
+Fixed:
+* Fixed some compilation problems and related issues.
+
 4.6.0
 -----
 

src/librssguard/gui/dialogs/formmain.cpp

@@ -868,10 +868,14 @@ void FormMain::createConnections() {
           &QAction::triggered,
           tabWidget()->feedMessageViewer()->messagesView(),
           &MessagesView::openSelectedSourceMessagesExternally);
-  connect(m_ui->m_actionOpenSelectedSourceArticlesExternally,
+
+#if defined(ENABLE_MEDIAPLAYER)
+  connect(m_ui->m_actionPlaySelectedArticlesInMediaPlayer,
           &QAction::triggered,
           tabWidget()->feedMessageViewer()->messagesView(),
           &MessagesView::playSelectedArticleInMediaPlayer);
+#endif
+
   connect(m_ui->m_actionOpenSelectedMessagesInternally,
           &QAction::triggered,
           tabWidget()->feedMessageViewer()->messagesView(),

src/librssguard/gui/tabwidget.cpp

@@ -130,9 +130,12 @@ void TabWidget::createConnections() {
           &MessagesView::openSingleMessageInNewTab,
           this,
           &TabWidget::addSingleMessageView);
+
+#if defined(ENABLE_MEDIAPLAYER)
   connect(feedMessageViewer()->messagesView(), &MessagesView::playLinkInMediaPlayer, this, [this](const QString& url) {
     addMediaPlayer(url, true);
   });
+#endif
 }
 
 void TabWidget::initializeTabs() {