summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranav Kant <pranavk@collabora.co.uk>2016-07-11 11:57:58 +0530
committerTor Lillqvist <tml@collabora.com>2016-10-11 17:47:42 +0300
commit634aac28db6653bfd7968bd60fe02cd057698a93 (patch)
treee50e999243f6343454ff911772983fee814801f0
parentloolwsd: better crash tests (diff)
downloadonline-634aac28db6653bfd7968bd60fe02cd057698a93.tar.gz
online-634aac28db6653bfd7968bd60fe02cd057698a93.zip
loolwsd: -Werror=shadow
Change-Id: Ic0bfead873ab7f0b9c177183c0f6d3179d097d96
-rw-r--r--loolwsd/DocumentBroker.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 273732082d..2bd8716537 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -570,7 +570,7 @@ void DocumentBroker::startDestroy(const std::string& id)
assert(currentSession != _sessions.end());
// Check if session which is being destroyed is last non-readonly session
- bool isLastEditableSession = !currentSession->second->isReadOnly();
+ bool lastEditableSession = !currentSession->second->isReadOnly();
for (auto& it: _sessions)
{
if (it.second->getId() == id)
@@ -578,12 +578,12 @@ void DocumentBroker::startDestroy(const std::string& id)
if (!it.second->isReadOnly())
{
- isLastEditableSession = false;
+ lastEditableSession = false;
}
}
// Last editable session going away
- _lastEditableSession = isLastEditableSession;
+ _lastEditableSession = lastEditableSession;
// Last view going away, can destroy.
_markToDestroy = (_sessions.size() <= 1);