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

[Armin Le Grand]

 comphelper/source/misc/backupfilehelper.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 8dcad50137bdcfd1fd1ef444b3397bdec1d5417a
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Fri Oct 21 17:51:19 2016 +0200

    profilesafe: Make sure no recursive saving happens
    
    Change-Id: Idd57a948fcaaf23614ca1a92051a50b86e4bb0c5
    Reviewed-on: https://gerrit.libreoffice.org/30145
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>

diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index d8780d9..0615117 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -2613,6 +2613,10 @@ namespace comphelper
                 maDirs,
                 maFiles);
 
+            // should not extist, but for the case an error occurred and it got
+            // copied somehow, avoid further recurive copying/saving
+            maDirs.erase("SafeMode");
+
             // not really needed, can be abandoned
             maDirs.erase("psprint");