[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/DocumentBroker.cpp

[Pranav Kant]

 loolwsd/DocumentBroker.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 634aac28db6653bfd7968bd60fe02cd057698a93
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Jul 11 11:57:58 2016 +0530

    loolwsd: -Werror=shadow
    
    Change-Id: Ic0bfead873ab7f0b9c177183c0f6d3179d097d96

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 2737320..2bd8716 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);