Merge pull request #4733 from anatoly-os/saveonline_fix_clear_cache

fix #284874: login screen in Save online is empty
musescore · Feb 28, 2019 · b3cbad9 · b3cbad9
1 parent bbe8dbf
commit b3cbad9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
@@ -313,6 +313,14 @@ void LoginManager::loginInteractive()
       profile->setPersistentCookiesPolicy(QWebEngineProfile::NoPersistentCookies);
       profile->setRequestInterceptor(new ApiWebEngineRequestInterceptor(profile));
 
+      //workaround for the crashes sometimes happend in Chromium on macOS with Qt 5.12
+      connect(webView, &QWebEngineView::renderProcessTerminated, this, [profile, webView](QWebEnginePage::RenderProcessTerminationStatus terminationStatus, int exitCode)
+              {
+              qDebug() << "Login page loading terminated" << terminationStatus << " " << exitCode;
+              profile->clearHttpCache();
+              webView->show();
+              });
+
       connect(page, &QWebEnginePage::loadFinished, this, [this, page, webView](bool ok) {
             if (!ok)
                   return;

diff --git a/mscore/startcenter.cpp b/mscore/startcenter.cpp
@@ -61,17 +61,28 @@ Startcenter::Startcenter(QWidget* parent)
 #ifdef USE_WEBENGINE
       if (!noWebView) {
             _webView = new MyWebView(this);
-            _webView->setMaximumWidth(200);  
+            _webView->setMaximumWidth(200);
 
             MyWebEnginePage* page = new MyWebEnginePage(this);
             MyWebUrlRequestInterceptor* wuri = new MyWebUrlRequestInterceptor(page);
-            page->profile()->setRequestInterceptor(wuri);
+            QWebEngineProfile* profile = page->profile();
+            profile->setRequestInterceptor(wuri);
             _webView->setPage(page);
 
             auto extendedVer = QString(VERSION) + "." + QString(BUILD_NUMBER);
-            _webView->setUrl(QUrl(QString("https://connect2.musescore.com/?version=%1").arg(extendedVer)));
+            QUrl connectPageUrl = QUrl(QString("https://connect2.musescore.com/?version=%1").arg(extendedVer));
+            _webView->setUrl(connectPageUrl);
 
             horizontalLayout->addWidget(_webView);
+
+            //workaround for the crashes sometimes happend in Chromium on macOS with Qt 5.12
+            connect(_webView, &QWebEngineView::renderProcessTerminated, this, [this, profile, &connectPageUrl](QWebEnginePage::RenderProcessTerminationStatus terminationStatus, int exitCode)
+                    {
+                    qDebug() << "Login page loading terminated" << terminationStatus << " " << exitCode;
+                    profile->clearHttpCache();
+                    _webView->load(connectPageUrl);
+                    _webView->show();
+                    });
             }
 #endif