New upstream version 3.6.1

[minitube] / src / video.cpp

diff --git a/src/video.cpp b/src/video.cpp
index 6df9fd88b14f318fbbba6d6d8962923d6549e490..40ed56f2a6ec59cede611447e4e7dd5521103561 100644 (file)
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -138,16 +138,14 @@ void Video::loadStreamUrlJS() {
     ytjsVideo = new YTJSVideo(id, this);
     connect(ytjsVideo, &YTJSVideo::gotStreamUrl, this, &Video::streamUrlLoaded);
     connect(ytjsVideo, &YTJSVideo::errorStreamUrl, this, [this](const QString &msg) {
-        emit errorStreamUrl(msg);
         ytjsVideo->deleteLater();
         ytjsVideo = nullptr;
+        loadStreamUrlYT();
     });
     ytjsVideo->loadStreamUrl();
 }
 
-void Video::loadStreamUrl() {
-    loadStreamUrlJS();
-    return;
+void Video::loadStreamUrlYT() {
     if (ytVideo) {
         qDebug() << "Already loading" << id;
         return;
@@ -162,6 +160,10 @@ void Video::loadStreamUrl() {
     ytVideo->loadStreamUrl();
 }
 
+void Video::loadStreamUrl() {
+    loadStreamUrlJS();
+}
+
 void Video::abortLoadStreamUrl() {
     if (ytVideo) {
         ytVideo->disconnect(this);