[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp

[Miklos Vajna]

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

New commits:
commit e644fd2e1c8c4917e440d6d19be010e54e478320
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Nov 19 08:32:05 2015 +0100

    loolwsd: -Werror,-Wunused-value
    
    Found by clang.

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 112eb08..41b89f3 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -1219,7 +1219,7 @@ bool ChildProcessSession::insertFile(const char* /*buffer*/, int /*length*/, Str
     std::string name, type;
 
     if (tokens.count() != 3 ||
-        !getTokenString(tokens[1], "name", name),
+        !getTokenString(tokens[1], "name", name) ||
         !getTokenString(tokens[2], "type", type))
     {
         sendTextFrame("error: cmd=insertfile kind=syntax");
@@ -1272,8 +1272,8 @@ bool ChildProcessSession::mouseEvent(const char* /*buffer*/, int /*length*/, Str
                          type) ||
         !getTokenInteger(tokens[2], "x", x) ||
         !getTokenInteger(tokens[3], "y", y) ||
-        !getTokenInteger(tokens[4], "count", count),
-        !getTokenInteger(tokens[5], "buttons", buttons),
+        !getTokenInteger(tokens[4], "count", count) ||
+        !getTokenInteger(tokens[5], "buttons", buttons) ||
         !getTokenInteger(tokens[6], "modifier", modifier))
     {
         sendTextFrame("error: cmd=mouse kind=syntax");