[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source

[Noel Grandin (via logerrit)]

 desktop/source/app/officeipcthread.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fb3a433264e34fc48e351d21d93a7bb4f431113
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat Sep 8 09:26:12 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Apr 17 11:59:46 2019 +0300

    clang-tidy bugprone-unused-raii in RequestHandler
    
    The message from clang-tidy is:
        warning: object destroyed immediately after creation; did you mean
    to name the object?
    
    The guard in
    RequestHandler::ExecuteCmdLineRequests
    comes from
    commit cf333a878ceed18d0343520a2c65be69fc433b1f
    Date:   Sun Jan 21 22:10:09 2018 +0300
    tdf#38915: set cProcessed condition on any process outcome
    and I'm sure it's intention was to set the flag on exit from the
    function, not immediately.
    
    Reviewed-on: https://gerrit.libreoffice.org/60183
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 867ee21fe4c0c9216aea57850efec4de3c3fc554)
    
    Change-Id: Ibf874a5774770df00b9db7f673554e7ffda55072
    Reviewed-on: https://gerrit.libreoffice.org/66168
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index a128a073ea0b..64098a758058 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1324,7 +1324,7 @@ bool RequestHandler::ExecuteCmdLineRequests(
     osl::ClearableMutexGuard aGuard( GetMutex() );
 
     // ensure that Processed flag (if exists) is signaled in any outcome
-    ConditionSetGuard(aRequest.pcProcessed);
+    ConditionSetGuard aSetGuard(aRequest.pcProcessed);
 
     static std::vector<DispatchWatcher::DispatchRequest> aDispatchList;