diff options
author | dec05eba <dec05eba@protonmail.com> | 2019-04-09 00:51:24 +0200 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2020-08-18 23:38:23 +0200 |
commit | f58b5becfa45818a6825e28c394ee2ee7d92d147 (patch) | |
tree | 144dd79615b5a89a01a27674ac2948e132698743 /src | |
parent | 0cae593b94c4fdfe100516c7f08f75e40bc1e089 (diff) |
Fix invite user crash, set avatar url
Diffstat (limited to 'src')
-rw-r--r-- | src/Room.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Room.cpp b/src/Room.cpp index bc87c05..44407c1 100644 --- a/src/Room.cpp +++ b/src/Room.cpp @@ -143,7 +143,7 @@ namespace dchat if(rooms->callbackFuncs.receiveInviteUserCallbackFunc) { InviteUserRequest request; - request.room = std::shared_ptr<Room>(this); + request.room = this; request.userPublicKey = std::move(userPublicKey); request.message = std::move(userMsg); rooms->callbackFuncs.receiveInviteUserCallbackFunc(request); @@ -366,9 +366,10 @@ namespace dchat roomRequest.user = user; roomRequest.timestampSeconds = timestampSeconds; roomRequest.loadedFromCache = request.loadedFromCache; - roomRequest.url = std::move(url); + roomRequest.url = url; if(callbackFuncs.userChangeAvatarCallbackFunc) callbackFuncs.userChangeAvatarCallbackFunc(roomRequest); + user->avatarUrl = std::move(url); } break; } |