[Libreoffice-commits] core.git: include/comphelper

[Caolán McNamara]

 include/comphelper/unique_disposing_ptr.hxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 899ffa4c4c66702e2a65f4065cbb7970d0e9c0e2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon May 8 15:51:46 2017 +0100

    gnome-documents: hold solarmutex on dtor patch as well
    
    Change-Id: I75fe71612116d435606c37185bf55b450425fc25
    Reviewed-on: https://gerrit.libreoffice.org/37396
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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();
+    }
 };
 
 }