mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable sdremote by default, and improve flow control.

Browse Source 
It was intended to disable sdremote by default when it exited
experimental mode.

This reverts commit 576943b9bf.

Change-Id: I2c1b5443e334021bd9574316167f48b1af6200e5
This commit is contained in:
Michael Meeks
2014-10-07 10:10:27 +01:00
parent 5b0e6aea60
commit 6ced5dbd1a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
officecfg/registry/schema/org/openoffice/Office/Impress.xcs
View File

@@ -619,7 +619,7 @@
<desc>Indicates whether to enable the Impress remote controller.</desc> <desc>Indicates whether to enable the Impress remote controller.</desc>
<label>Enable remote control</label> <label>Enable remote control</label>
</info> </info>
<value>true</value> <value>false</value>
</prop> </prop>
<prop oor:name="EnablePresenterScreen" oor:type="xs:boolean" oor:nillable="false"> <prop oor:name="EnablePresenterScreen" oor:type="xs:boolean" oor:nillable="false">
<info> <info>

6
sd/source/ui/remotecontrol/Server.cxx
View File

@@ -117,7 +117,11 @@ void RemoteServer::execute()
{ {
OString aName( aLine ); OString aName( aLine );
if ( ! pSocket->readLine( aLine ) ) delete pSocket; if ( ! pSocket->readLine( aLine ) )
{
delete pSocket;
continue;
}
OString aPin( aLine ); OString aPin( aLine );
SocketAddr aClientAddr; SocketAddr aClientAddr;