|
 |
f085be |
From 99023fe9bd7d8b665faed7fe9cb98b3fb8922292 Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Michael Meeks <michael.meeks@collabora.com>
|
|
|
f085be |
Date: Tue, 7 Oct 2014 10:10:27 +0100
|
|
|
f085be |
Subject: [PATCH] Disable sdremote by default, and improve flow control.
|
|
|
f085be |
|
|
|
f085be |
It was intended to disable sdremote by default when it exited
|
|
|
f085be |
experimental mode.
|
|
|
f085be |
|
|
|
f085be |
This reverts commit 576943b9bf7506829de97d2194c4bee35a485436.
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I2c1b5443e334021bd9574316167f48b1af6200e5
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/11837
|
|
|
f085be |
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
|
|
|
f085be |
Tested-by: Jan Holesovsky <kendy@collabora.com>
|
|
|
f085be |
---
|
|
|
f085be |
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 2 +-
|
|
|
f085be |
sd/source/ui/remotecontrol/Server.cxx | 6 +++++-
|
|
|
f085be |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
|
|
|
f085be |
index b740aca..01836d6 100644
|
|
|
f085be |
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
|
|
|
f085be |
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
|
|
|
f085be |
@@ -629,7 +629,7 @@
|
|
|
f085be |
<desc>Indicates whether to enable the Impress remote controller.</desc>
|
|
|
f085be |
<label>Enable remote control</label>
|
|
|
f085be |
</info>
|
|
|
f085be |
- <value>true</value>
|
|
|
f085be |
+ <value>false</value>
|
|
|
f085be |
</prop>
|
|
|
f085be |
<prop oor:name="EnablePresenterScreen" oor:type="xs:boolean" oor:nillable="false">
|
|
|
f085be |
<info>
|
|
|
f085be |
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
|
|
|
f085be |
index 51796cc..fb24e67 100644
|
|
|
f085be |
--- a/sd/source/ui/remotecontrol/Server.cxx
|
|
|
f085be |
+++ b/sd/source/ui/remotecontrol/Server.cxx
|
|
|
f085be |
@@ -115,7 +115,11 @@ void RemoteServer::execute()
|
|
|
f085be |
{
|
|
|
f085be |
OString aName( aLine );
|
|
|
f085be |
|
|
|
f085be |
- if ( ! pSocket->readLine( aLine ) ) delete pSocket;
|
|
|
f085be |
+ if ( ! pSocket->readLine( aLine ) )
|
|
|
f085be |
+ {
|
|
|
f085be |
+ delete pSocket;
|
|
|
f085be |
+ continue;
|
|
|
f085be |
+ }
|
|
|
f085be |
OString aPin( aLine );
|
|
|
f085be |
|
|
|
f085be |
SocketAddr aClientAddr;
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|