network authentication: don't crash if a network request is closed wh…

…ile the credentials dialog is open (fixes #9379)
qgis · Feb 17, 2014 · 7c4c7e8 · 7c4c7e8
1 parent 7becd76
commit 7c4c7e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9474,6 +9474,9 @@ void QgisApp::namAuthenticationRequired( QNetworkReply *reply, QAuthenticator *a
   if ( !ok )
     return;
 
+  if( reply->isFinished() )
+    return;
+
   auth->setUser( username );
   auth->setPassword( password );
 }

diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
@@ -183,7 +183,8 @@ void QgsNetworkAccessManager::abortRequest()
 
   QgsMessageLog::logMessage( tr( "Network request %1 timed out" ).arg( reply->url().toString() ), tr( "Network" ) );
 
-  reply->abort();
+  if( reply->isRunning() )
+    reply->close();
 }
 
 QString QgsNetworkAccessManager::cacheLoadControlName( QNetworkRequest::CacheLoadControl theControl )