From cad1d9aa9c108b09f62622744fbe5635190c04c4 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Sun, 22 Jul 2018 03:42:18 +1000 Subject: [PATCH] Handle case where IO thread is not yet running, in C67 this results in a hard crash refs: https://chromium-review.googlesource.com/c/chromium/src/+/973556 --- brightray/browser/browser_client.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/brightray/browser/browser_client.cc b/brightray/browser/browser_client.cc index b2b7d36301f4..93b8cef96d4f 100644 --- a/brightray/browser/browser_client.cc +++ b/brightray/browser/browser_client.cc @@ -39,7 +39,8 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { void BrowserClient::SetApplicationLocale(const std::string& locale) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (!BrowserThread::PostTask( + if (!BrowserThread::IsThreadInitialized(BrowserThread::IO) || + !BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::BindOnce(&SetApplicationLocaleOnIOThread, locale))) { g_io_thread_application_locale.Get() = locale;