sdext/source/presenter/PresenterProtocolHandler.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit e8a281ac3b1b58542e5dba930f7fa3f0f28a8c03 Author: Patrick Luby <[email protected]> AuthorDate: Fri Apr 21 14:34:39 2023 -0400 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Apr 24 10:11:01 2023 +0200 tdf#154546 skip dispatch when presenter controller is not set mpPresenterController is sometimes unset and this will cause a crash when pressing the presenter console's Exchange button. Change-Id: Ibfc866d573ce0c535df5c8fdbd6d358353784854 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150456 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> Reviewed-by: Patrick Luby <[email protected]> (cherry picked from commit 6f4fb52116c08b0c6247dc4828442f4e3644e9eb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150776 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Tested-by: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index a32a73b6180e..96c538876de6 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -307,7 +307,10 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch ( Reference<frame::XDispatch> xDispatch; - if (rURL.Protocol == "vnd.org.libreoffice.presenterscreen:") + // tdf#154546 skip dispatch when presenter controller is not set + // mpPresenterController is sometimes unset and this will cause a + // crash when pressing the presenter console's Exchange button. + if (rURL.Protocol == "vnd.org.libreoffice.presenterscreen:" && mpPresenterController.is()) { xDispatch.set(Dispatch::Create(rURL.Path, mpPresenterController)); }
