0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE fix account re-adding not updating current account

Browse Source
This commit is contained in:
Petr Mrázek 2021-11-16 02:21:59 +01:00
parent 25fbeb265a
commit 6c82883206
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/minecraft/auth/AccountList.cpp
View File

@ -69,14 +69,17 @@ void AccountList::addAccount(const MinecraftAccountPtr account)
// override/replace existing account with the same profileId // override/replace existing account with the same profileId
auto existingAccount = findAccountByProfileId(profileId); auto existingAccount = findAccountByProfileId(profileId);
if(existingAccount != -1) { if(existingAccount != -1) {
MinecraftAccountPtr existingAccountPtr = m_accounts[existingAccount];
m_accounts[existingAccount] = account; m_accounts[existingAccount] = account;
if(m_activeAccount == existingAccountPtr) {
m_activeAccount = account;
}
emit dataChanged(index(existingAccount), index(existingAccount, columnCount(QModelIndex()) - 1)); emit dataChanged(index(existingAccount), index(existingAccount, columnCount(QModelIndex()) - 1));
onListChanged(); onListChanged();
return; return;
} }
} }
// if we don't have this porfileId yet, add the account to the end // if we don't have this porfileId yet, add the account to the end
int row = m_accounts.count(); int row = m_accounts.count();
beginInsertRows(QModelIndex(), row, row); beginInsertRows(QModelIndex(), row, row);

6
launcher/minecraft/auth/flows/AuthRequest.cpp
View File

@ -89,7 +89,7 @@ void AuthRequest::onUploadProgress(qint64 uploaded, qint64 total) {
emit uploadProgress(uploaded, total); emit uploadProgress(uploaded, total);
} }
void AuthRequest::setup(const QNetworkRequest &req, QNetworkAccessManager::Operation operation, const QByteArray &verb) { void AuthRequest::setup(const QNetworkRequest &req, QNetworkAccessManager::Operation operation) {
request_ = req; request_ = req;
operation_ = operation; operation_ = operation;
url_ = req.url(); url_ = req.url();
@ -97,10 +97,6 @@ void AuthRequest::setup(const QNetworkRequest &req, QNetworkAccessManager::Opera
QUrl url = url_; QUrl url = url_;
request_.setUrl(url); request_.setUrl(url);
if (!verb.isEmpty()) {
request_.setRawHeader(Katabasis::HTTP_HTTP_HEADER, verb);
}
status_ = Requesting; status_ = Requesting;
error_ = QNetworkReply::NoError; error_ = QNetworkReply::NoError;
} }

2
launcher/minecraft/auth/flows/AuthRequest.h
View File

@ -48,7 +48,7 @@ protected slots:
void onUploadProgress(qint64 uploaded, qint64 total); void onUploadProgress(qint64 uploaded, qint64 total);
protected: protected:
void setup(const QNetworkRequest &request, QNetworkAccessManager::Operation operation, const QByteArray &verb = QByteArray()); void setup(const QNetworkRequest &request, QNetworkAccessManager::Operation operation);
enum Status { enum Status {
Idle, Requesting, ReRequesting Idle, Requesting, ReRequesting