[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/remotecontrol/Server.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2df0884339842fa9611b9a116f8aac6c1435f465
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Tue Sep 11 03:19:26 2012 +0200

    On error, properly exit from Impress RemoteServer::getClients
    
    Looks like the actual return was missing in front of the empty
    vector.
    
    Change-Id: I0ccf0be53ef54138a3ebffab7b09b93b8c629aa0

diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 27dc20c..bc24536 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -206,10 +206,11 @@ void RemoteServer::removeCommunicator( Communicator* mCommunicator )
 
 std::vector<ClientInfo*> RemoteServer::getClients()
 {
+    std::vector<ClientInfo*> aClients;
     if ( !spServer )
-        std::vector<ClientInfo*>();
+        return aClients;
+
     MutexGuard aGuard( spServer->mDataMutex );
-    std::vector<ClientInfo*> aClients;
     aClients.assign( spServer->mAvailableClients.begin(),
                      spServer->mAvailableClients.end() );
     return aClients;