summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2019-09-08 17:28:40 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2019-11-23 20:06:14 +0100
commitf260b8b4aede752d66e4351fe4c09282d7b93db7 (patch)
tree0f983fb2138dec029d7e1febc5d7f666f3ebd9f6 /src
parentFix ci formatter to format all files (diff)
downloadnheko-f260b8b4aede752d66e4351fe4c09282d7b93db7.tar.xz
Fix shadow error
Diffstat (limited to 'src')
-rw-r--r--src/timeline2/TimelineModel.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/timeline2/TimelineModel.cpp b/src/timeline2/TimelineModel.cpp

index 0d4ec239..d3d6f5c7 100644 --- a/src/timeline2/TimelineModel.cpp +++ b/src/timeline2/TimelineModel.cpp
@@ -514,11 +514,11 @@ TimelineModel::decryptEvent(const mtx::events::EncryptedEvent<mtx::events::msg:: json event_array = json::array(); event_array.push_back(body); - std::vector<mtx::events::collections::TimelineEvents> events; - mtx::responses::utils::parse_timeline_events(event_array, events); + std::vector<mtx::events::collections::TimelineEvents> temp_events; + mtx::responses::utils::parse_timeline_events(event_array, temp_events); - if (events.size() == 1) - return {events.at(0), true}; + if (temp_events.size() == 1) + return {temp_events.at(0), true}; dummy.content.body = tr("-- Encrypted Event (Unknown event type) --",