[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svtools/source

[Caolán McNamara (via logerrit)]

 svtools/source/control/ctrlbox.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 096e288731519a30006dc6d865db72ffb6cac6d6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 15 15:28:09 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Jul 15 18:01:31 2021 +0200

    crashreporting: Crash seen in CachePreview from Idle UpdateHdl
    
    the intent here is regenerate the previews if font settings changed
    which should mean that we restart at index 0 and not continue from
    the old index
    
    https: //crashreport.libreoffice.org/stats/crash_details/a01c5fcd-983b-40ab-b90a-8ee90286e5b8
    
    Change-Id: I9604ad96cf6cc757d2d33469827d1295d309454d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118923
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 4a0210cde5bd..7c7f61cb61f8 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -360,8 +360,11 @@ IMPL_LINK(FontNameBox, SettingsChangedHdl, VclSimpleEvent&, rEvent, void)
         gFontPreviewVirDevs.clear();
         gRenderedFontNames.clear();
         calcCustomItemSize(*m_xComboBox);
-        if (mbWYSIWYG)
+        if (mbWYSIWYG && mpFontList && !mpFontList->empty())
+        {
+            mnPreviewProgress = 0;
             maUpdateIdle.Start();
+        }
     }
 }