diff options
| author | Patrick Luby <patrick.luby@collabora.com> | 2023-04-16 10:10:35 -0400 |
|---|---|---|
| committer | Patrick Luby <plubius@neooffice.org> | 2023-04-21 19:08:10 +0200 |
| commit | b3f3d1447477428669a6d96dc2d6421de61204ba (patch) | |
| tree | 6bfd8d63817d99e2aacaa6c55b1b354587e21b8a /sd | |
| parent | 53f72f72ab501bb12bd6fd8ff9788b9a278c16bf (diff) | |
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 <noel.grandin@collabora.co.uk>
Reviewed-by: Patrick Luby <plubius@neooffice.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/console/PresenterProtocolHandler.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/console/PresenterProtocolHandler.cxx b/sd/source/console/PresenterProtocolHandler.cxx index 8064f56597c4..ddfb4340c09b 100644 --- a/sd/source/console/PresenterProtocolHandler.cxx +++ b/sd/source/console/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)); } |