summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Impress.xcs2
-rw-r--r--sd/source/ui/remotecontrol/Server.cxx6
2 files changed, 6 insertions, 2 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 56116e3102bd..3c89f9fc9984 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 5ec118400d2c..7404bbddcfbf 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;