summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-12-18 04:42:24 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2020-12-18 04:42:24 +0100
commitfac28bac1a704f04acf014536d050cb3820d41a0 (patch)
tree84b313ea113c90e209832c305aeebbe46044fd83
parentFix some shadow warnings (diff)
downloadnheko-fac28bac1a704f04acf014536d050cb3820d41a0.tar.xz
Another shadowed variable
-rw-r--r--src/Olm.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Olm.cpp b/src/Olm.cpp

index 67006490..07fc49f6 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp
@@ -270,9 +270,10 @@ handle_olm_message(const OlmMessage &msg) } else if (auto roomKey = std::get_if<DeviceEvent<msg::RoomKey>>(&device_event)) { create_inbound_megolm_session(*roomKey, msg.sender_key); - } else if (auto roomKey = std::get_if<DeviceEvent<msg::ForwardedRoomKey>>( - &device_event)) { - import_inbound_megolm_session(*roomKey); + } else if (auto forwardedRoomKey = + std::get_if<DeviceEvent<msg::ForwardedRoomKey>>( + &device_event)) { + import_inbound_megolm_session(*forwardedRoomKey); } else if (auto e = std::get_if<DeviceEvent<msg::SecretSend>>(&device_event)) { auto local_user = http::client()->user_id();