ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build failure

Browse Source 
isJobRunning() -> isJobPending()
This commit is contained in:
Nate Graham
2021-01-08 07:35:29 -07:00
parent 43c7e00ec5
commit ab8dabc280
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controller.cpp
View File

@@ -442,7 +442,7 @@ void Controller::playAudio(const QUrl &localFile)
void Controller::changeAvatar(Connection *conn, const QUrl &localFile) void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
{ {
auto job = conn->uploadFile(localFile.toLocalFile()); auto job = conn->uploadFile(localFile.toLocalFile());
if (isJobRunning(job)) { if (isJobPending(job)) {
connect(job, &BaseJob::success, this, [conn, job] { connect(job, &BaseJob::success, this, [conn, job] {
conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri()); conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
}); });

2
src/neochatroom.cpp
View File

@@ -433,7 +433,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
void NeoChatRoom::changeAvatar(const QUrl &localFile) void NeoChatRoom::changeAvatar(const QUrl &localFile)
{ {
const auto job = connection()->uploadFile(localFile.toLocalFile()); const auto job = connection()->uploadFile(localFile.toLocalFile());
if (isJobRunning(job)) { if (isJobPending(job)) {
connect(job, &BaseJob::success, this, [this, job] { connect(job, &BaseJob::success, this, [this, job] {
connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri()}}); connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri()}});
}); });