[Libreoffice-commits] core.git: vcl/unx

[Jan-Marek Glogowski (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx  |    3 ---
 vcl/unx/generic/fontmanager/fontmanager.cxx |    1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 7ef1ec18089aa45e8053c0c73ad71aa3f78b9758
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sun Jun 27 21:02:19 2021 +0000
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Mon Jun 28 16:07:41 2021 +0200

    No need to Stop() a Timer before Start()
    
    Start() resets a timer per default, otherwise check IsActive().
    Also add a debug name to it.
    
    Change-Id: I1588161bb3fead42c3b26282dfa05d149aa94c52
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118020
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 8194aef619d2..18a0408d34ae 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -1150,10 +1150,7 @@ void PrintFontManager::Substitute(FontSelectPattern &rPattern, OUString& rMissin
                         }
                     }
                     if (!m_aCurrentRequests.empty())
-                    {
-                        m_aFontInstallerTimer.Stop();
                         m_aFontInstallerTimer.Start();
-                    }
                 }
                 rMissingCodes = sStillMissing;
             }
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 44471107bd33..67f5868c1c8e 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -119,6 +119,7 @@ PrintFontManager::PrintFontManager()
 {
     m_aFontInstallerTimer.SetInvokeHandler(LINK(this, PrintFontManager, autoInstallFontLangSupport));
     m_aFontInstallerTimer.SetTimeout(5000);
+    m_aFontInstallerTimer.SetDebugName("PrintFontManager m_aFontInstallerTimer");
 }
 
 PrintFontManager::~PrintFontManager()