[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sfx2/source

[Caolán McNamara]

 sfx2/source/control/unoctitm.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit a2e1f2749ee446e3be87e6bb8eacc26376f1f34b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 2 14:21:46 2016 +0000

    usageinfo causes one of our more frequent fedora 25 crashes
    
    https://retrace.fedoraproject.org/faf/problems/bthash/?bth=17ba9a57f40d5ca29778866a9f96c1c0dfc7593c&bth=2f1801e44e9cb0be2b013624521fb0959dc2c73a&bth=5e8a1e07503f53b13b3a6779084f8b0637aaf5a7&bth=8033013a2ce586bccc23245583fa86ef4a761dce&bth=975271167132418534cb07336601efb5b0c711f0&bth=de75c2ad7917bc889d6307b152f79d34e79ce74d
    
    Change-Id: Ie93afa476eca9fdbf7ea17ff0189fbaa493a5531
    (cherry picked from commit a064f1226b9864f0d0ef6d969f2ae53cc413eb51)
    Reviewed-on: https://gerrit.libreoffice.org/31554
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 7ed25a4..5fa526b 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -452,6 +452,9 @@ class UsageInfo {
     /// Command vs. how many times it was used
     UsageMap maUsage;
 
+    /// config path, get it long before atexit time
+    OUString msConfigPath;
+
 public:
     UsageInfo() : mbIsCollecting(false)
     {
@@ -469,7 +472,12 @@ public:
     void save();
 
     /// Modify the flag whether we are collecting.
-    void setCollecting(bool bIsCollecting) { mbIsCollecting = bIsCollecting; }
+    void setCollecting(bool bIsCollecting)
+    {
+        mbIsCollecting = bIsCollecting;
+        if (mbIsCollecting)
+            msConfigPath = SvtPathOptions().GetConfigPath();
+    }
 };
 
 void UsageInfo::increment(const OUString &rCommand)
@@ -487,7 +495,7 @@ void UsageInfo::save()
     if (!mbIsCollecting)
         return;
 
-    OUString path(SvtPathOptions().GetConfigPath());
+    OUString path(msConfigPath);
     path += "usage/";
     osl::Directory::createPath(path);