[Libreoffice-commits] core.git: svl/source

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 29 18:57:07 UTC 2019


 svl/source/undo/undo.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit f591bf522d2c63ad7f9fc87388671afbc16fbcd0
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Apr 29 19:25:42 2019 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Apr 29 20:56:09 2019 +0200

    tdf#125030: Prevent double-clearing the guard
    
    ... discovered after after commit d38f9934f08939032cca64a32de58fa3901a88d5.
    
    Change-Id: I09bcee0053d1a5132483c933a903f006a236a679
    Reviewed-on: https://gerrit.libreoffice.org/71550
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 7802985e6e1e..5cccb085d65f 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -871,6 +871,7 @@ bool SfxUndoManager::Repeat( SfxRepeatTarget &rTarget )
         aGuard.clear();
         if ( pAction->CanRepeat( rTarget ) )
             pAction->Repeat( rTarget );
+        aGuard.reset(); // allow clearing in guard dtor
         return true;
     }
 


More information about the Libreoffice-commits mailing list