Merge pull request #623 from biolds/master

Fix crash when authentication fails. Fix #7913
qgis · May 31, 2013 · ce92549 · ce92549
2 parents 32da891 + c1797fc
commit ce92549
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/gui/qgscredentialdialog.cpp b/src/gui/qgscredentialdialog.cpp
@@ -64,7 +64,7 @@ void QgsCredentialDialog::requestCredentials( QString realm, QString *username,
 
   QgsDebugMsg( "exec()" );
   *ok = exec() == QDialog::Accepted;
-  QgsDebugMsg( QString( "exec(): %1" ).arg( ok ? "true" : "false" ) );
+  QgsDebugMsg( QString( "exec(): %1" ).arg( *ok ? "true" : "false" ) );
 
   QApplication::restoreOverrideCursor();
 

diff --git a/src/providers/wfs/qgswfssourceselect.cpp b/src/providers/wfs/qgswfssourceselect.cpp
@@ -207,8 +207,6 @@ void QgsWFSSourceSelect::capabilitiesReplyFinished()
     }
     // handle errors
     QMessageBox::critical( 0, title, mCapabilities->errorMessage() );
-
-    btnAdd->setEnabled( false );
     return;
   }