From 1835a9f398c1400a254b5df8f8da2f1e357a45a0 Mon Sep 17 00:00:00 2001 From: Val Doroshchuk Date: Fri, 12 Apr 2019 09:28:12 +0200 Subject: DirectShow: Report about an error for wrong urls If wrong url is passed, no need to try it again. But report an error instead. Also there cannot be empty url, because if an url is empty, NoMedia should be emitted. Fixes tst_QMediaPlayerBackend::playlistObject() Task-number: QTBUG-65574 Change-Id: I658b16cfe7b96c202715651d6b20d01a9af6c746 Reviewed-by: Andy Shaw --- src/plugins/directshow/player/directshowplayerservice.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index bf7cbbfe4..2eeb06159 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -403,8 +403,6 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker) m_pendingTasks |= SetRate; m_source = source; - } else if (!m_resources.isEmpty()) { - m_pendingTasks |= SetUrlSource; } else { m_graphStatus = InvalidMedia; -- cgit v1.2.3