Merge branch 'settings_auto_update'

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 3761f78..55206bc 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -376,6 +376,8 @@ void MainWindow::clearCookieJar()
 
     buildWebView();
 
+    m_webView->stop();
+
     if(!m_cookieJar) {
         m_cookieJar = new NetworkCookieJar(new QNetworkCookieJar(this));
     }
@@ -924,7 +926,10 @@ void MainWindow::webViewRequestFinished(QNetworkReply *reply)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if(reply->error()) {
+    // omit QNetworkReply::OperationCanceledError due to it's nature to be called when ever
+    // qwebview starts to load a new page while the current page loading is not finished
+    if(reply->error() != QNetworkReply::OperationCanceledError &&
+       reply->error() != QNetworkReply::NoError) {
         emit error(reply->error());
         toggleProgressIndicator(false);
     }