diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 13:54:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 15:40:54 +0200 |
| commit | 63773ac90ed83987063077184e48b526f70216eb (patch) | |
| tree | 8560edd38463ec216cc48ba5b9ed6c9e10d6ba04 /slideshow/source/inc | |
| parent | e05e05d26ea1421c919a789c9c1afd393e0c19b2 (diff) | |
tdf#143728 Certain presentation crashes Impress after starting slideshow
Revert "osl::Mutex->std::mutex in EventQueue"
This reverts commit c0ce120b55ba389729e97babf80f2cb39ce38e9f.
because we try to take the same lock twice
Change-Id: Ie62659ec3407089f616d1ea950a3755300d68eef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119988
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow/source/inc')
| -rw-r--r-- | slideshow/source/inc/eventqueue.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx index fb0f1b8536eb..63c93f7a302d 100644 --- a/slideshow/source/inc/eventqueue.hxx +++ b/slideshow/source/inc/eventqueue.hxx @@ -21,10 +21,10 @@ #define INCLUDED_SLIDESHOW_SOURCE_INC_EVENTQUEUE_HXX #include <canvas/elapsedtime.hxx> +#include <osl/mutex.hxx> #include "event.hxx" -#include <mutex> #include <queue> #include <vector> @@ -116,7 +116,7 @@ namespace slideshow::internal getTimer() const { return mpTimer; } private: - mutable std::mutex maMutex; + mutable ::osl::Mutex maMutex; struct EventEntry { |