Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

This commit is contained in:
Petr Mrázek 2013-10-15 20:17:51 +02:00
commit ee1be22055

View File

@ -201,7 +201,13 @@ void LoginTask::processYggdrasilReply(QNetworkReply *reply)
emitFailed(tr("Login canceled.")); emitFailed(tr("Login canceled."));
break; break;
// Equivalent to an HTTP 403
case QNetworkReply::ContentOperationNotPermittedError:
emitFailed(tr("Invalid username or password."));
break;
default: default:
QLOG_DEBUG() << "Login failed with QNetworkReply code:" << reply->error();
emitFailed(tr("Login failed: %1").arg(reply->errorString())); emitFailed(tr("Login failed: %1").arg(reply->errorString()));
break; break;
} }