diff options
| author | Andrzej J. R. Hunt <andrzej@ahunt.org> | 2012-07-20 12:02:54 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:22:59 +0100 |
| commit | 0aa7aa85a4cb0b0608afea6c69f61ed8426c8185 (patch) | |
| tree | 48b7fc76bb69484d35297cc643470174093cb490 /sd/source/ui/remotecontrol/Server.cxx | |
| parent | 597924e78a7c34ed74aa642aafe9f3504a4c335d (diff) | |
Fixed a further bug in the Listener cycle. Refactored image storage.
Change-Id: I2b3f9e2c46dafde4bd488bc95675c04e8806c9a4
Diffstat (limited to 'sd/source/ui/remotecontrol/Server.cxx')
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index ab6a212d56f4..0329e27ffb1f 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -93,13 +93,10 @@ void Server::listenThread() } } // TODO: deal with transmision errors gracefully. + fprintf( stderr, "done with transmitting\n" ); mListener->disposing(); mListener = NULL; - if ( mPreparer.is() ) - delete mPreparer.get(); - mPreparer = NULL; - delete pTransmitter; pTransmitter = NULL; fprintf( stderr, "Finished listening\n" ); @@ -140,18 +137,21 @@ void Server::presentationStarted( const css::uno::Reference< { mListener = rtl::Reference<Listener>( new Listener( spServer, pTransmitter ) ); mListener->init( rController ); - - mPreparer = rtl::Reference<ImagePreparer>( new ImagePreparer( rController, pTransmitter ) ); - mPreparer->launch(); } } - +void Server::presentationStopped() +{ + if ( mListener.is() ) + { + mListener->disposing(); + mListener = NULL; + } +} Server *sd::Server::spServer = NULL; Transmitter *sd::Server::pTransmitter = NULL; rtl::Reference<Listener> sd::Server::mListener = NULL; -rtl::Reference<ImagePreparer> sd::Server::mPreparer = NULL; void Server::setup() { |