summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@jollamobile.com>2014-07-31 12:49:16 +0200
committerRobin Burchell <robin+qt@viroteck.net>2014-08-04 05:20:29 +0200
commit0ed18d846c0b425b0c50a2fefd7cc0fc148832c2 (patch)
tree8aecc325ae8e7a7789c47449dd12e3b4629f7133 /src/multimedia
parente16ac8b55c36586aa67b1d4ec5e1b4edf03cd06b (diff)
QMediaNetworkPlaylistProvider: Upon error parsing, stop parsing.
When an error is found parsing a playlist, stop parsing. This will also prevent the emission of the "loaded" signal when the parser finishes. Some of the newly added testcases do not yet pass because the parser is overly strict. These improvements are being tracked in QTBUG-40515. Change-Id: I5c96b7eb488996f28eebd7b6c643940de8e2e0b9 Done-by: Andres Gomez <agomez@igalia.com> Task-number: QTBUG-40513 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/playback/qmedianetworkplaylistprovider.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
index a8d8c4b04..9bbd7f3a6 100644
--- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
@@ -90,6 +90,8 @@ void QMediaNetworkPlaylistProviderPrivate::_q_handleParserError(QPlaylistFilePar
break;
}
+ parser.stop();
+
emit q->loadFailed(playlistError, errorMessage);
}