officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 2 +- sd/source/ui/remotecontrol/Server.cxx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 6ced5dbd1a4603b0f9c63e79d9da8b30c76b3805 Author: Michael Meeks <[email protected]> Date: Tue Oct 7 10:10:27 2014 +0100 Disable sdremote by default, and improve flow control. It was intended to disable sdremote by default when it exited experimental mode. This reverts commit 576943b9bf7506829de97d2194c4bee35a485436. Change-Id: I2c1b5443e334021bd9574316167f48b1af6200e5 diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index 56116e3..3c89f9f 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -619,7 +619,7 @@ <desc>Indicates whether to enable the Impress remote controller.</desc> <label>Enable remote control</label> </info> - <value>true</value> + <value>false</value> </prop> <prop oor:name="EnablePresenterScreen" oor:type="xs:boolean" oor:nillable="false"> <info> diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 5ec1184..7404bbd 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -117,7 +117,11 @@ void RemoteServer::execute() { OString aName( aLine ); - if ( ! pSocket->readLine( aLine ) ) delete pSocket; + if ( ! pSocket->readLine( aLine ) ) + { + delete pSocket; + continue; + } OString aPin( aLine ); SocketAddr aClientAddr; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
