[tor-commits] [tor-browser] 22/36: Bug 1771125 - Don't bother trying to start the font-info loader if we're already shutting down. r=lsalzman, a=RyanVM

[gitolite role via tor-commits <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to annotated tag FIREFOX_102_4_0esr_BUILD1
in repository tor-browser.

commit 26b0c88bd2a3cfe8a74e30898a22fd189f9a2fcf
Author: Jonathan Kew <jkew@xxxxxxxxxxx>
AuthorDate: Sat Sep 3 01:53:21 2022 +0000

    Bug 1771125 - Don't bother trying to start the font-info loader if we're already shutting down. r=lsalzman, a=RyanVM
    
    Differential Revision: https://phabricator.services.mozilla.com/D153335
---
 gfx/thebes/gfxPlatformFontList.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp
index e32e85940879..730781a6e4aa 100644
--- a/gfx/thebes/gfxPlatformFontList.cpp
+++ b/gfx/thebes/gfxPlatformFontList.cpp
@@ -2632,6 +2632,11 @@ void gfxPlatformFontList::CleanupLoader() {
 }
 
 void gfxPlatformFontList::GetPrefsAndStartLoader() {
+  // If we're already in shutdown, there's no point in starting this, and it
+  // could trigger an assertion if we try to use the Thread Manager too late.
+  if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownConfirmed)) {
+    return;
+  }
   uint32_t delay = std::max(1u, StaticPrefs::gfx_font_loader_delay_AtStartup());
   if (NS_IsMainThread()) {
     StartLoader(delay);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits