summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordldld <LibreOfficeContribution@dldld.de>2022-10-17 17:52:01 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2022-10-27 13:55:35 +0200
commit0c743c67bdaff9493196acc80fc2f2c04495c92e (patch)
treea9f0f77da06e1fc2e9de87c9c0a31afc44559427
parentupdate credits (diff)
downloadcore-0c743c67bdaff9493196acc80fc2f2c04495c92e.tar.gz
core-0c743c67bdaff9493196acc80fc2f2c04495c92e.zip
tdf#151608: Fix crash in disposing remotecontrol listener
Clearing the listener twice seems to be the problem here, because the WeakComponentImplHelperBase::dispose() tries to access the cleared listener when it was already cleared, causing the crash. The problem which is fixed by this commit appears when the Impress Remote App is closed, which is connected to a running presentation. So closing the app "kills" the presentation. I think I have seen this also happening, when the connection was closed due to bad wifi. Which also makes sense as the communication thread is getting stopped and the listener will be destroyed. Change-Id: I3c8fa535cfd4d82c846494f76ffb9ce43ebd606a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141468 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit e5aa82b259e35e3976734af38fff643ea28767df) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141851 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--sd/source/ui/remotecontrol/Communicator.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index b0645e72d430..59509ed3c74b 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -130,7 +130,6 @@ void Communicator::informListenerDestroyed()
if ( pTransmitter )
pTransmitter->addMessage( "slideshow_finished\n\n",
Transmitter::PRIORITY_HIGH );
- mListener.clear();
}
void Communicator::presentationStarted( const css::uno::Reference<