diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-08 15:51:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-09 09:31:20 +0200 |
| commit | 899ffa4c4c66702e2a65f4065cbb7970d0e9c0e2 (patch) | |
| tree | 782e7e7f02ebd76c47e17b68090953711ed62c62 /include/comphelper | |
| parent | rhbz#1444437 gnome-documents finalize may not occur immediately (diff) | |
| download | core-899ffa4c4c66702e2a65f4065cbb7970d0e9c0e2.tar.gz core-899ffa4c4c66702e2a65f4065cbb7970d0e9c0e2.zip | |
gnome-documents: hold solarmutex on dtor patch as well
Change-Id: I75fe71612116d435606c37185bf55b450425fc25
Reviewed-on: https://gerrit.libreoffice.org/37396
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/comphelper')
| -rw-r--r-- | include/comphelper/unique_disposing_ptr.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx index a22b3ac761b3..d39f9f3aec8d 100644 --- a/include/comphelper/unique_disposing_ptr.hxx +++ b/include/comphelper/unique_disposing_ptr.hxx @@ -171,6 +171,12 @@ public: SolarMutexGuard aGuard; unique_disposing_ptr<T>::reset(p); } + + virtual ~unique_disposing_solar_mutex_reset_ptr() override + { + if (unique_disposing_ptr<T>::get() && comphelper::SolarMutex::get()) + reset(); + } }; } |