diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:40:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:40:50 +0000 |
| commit | 6bcdad51bdf6662fbc75039462f434deeb2e13fe (patch) | |
| tree | c891f1f87097e4911fe28148b5d9f268e545149f /dom/cache/DBAction.cpp | |
| parent | Adding debian version 115.11.0esr-1. (diff) | |
| download | firefox-esr-6bcdad51bdf6662fbc75039462f434deeb2e13fe.tar.xz firefox-esr-6bcdad51bdf6662fbc75039462f434deeb2e13fe.zip | |
Merging upstream version 115.12.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/cache/DBAction.cpp')
| -rw-r--r-- | dom/cache/DBAction.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dom/cache/DBAction.cpp b/dom/cache/DBAction.cpp index 0a51260fe5..218ceb1808 100644 --- a/dom/cache/DBAction.cpp +++ b/dom/cache/DBAction.cpp @@ -14,6 +14,7 @@ #include "mozilla/dom/quota/PersistenceType.h" #include "mozilla/dom/quota/ResultExtensions.h" #include "mozilla/net/nsFileProtocolHandler.h" +#include "mozilla/AppShutdown.h" #include "mozIStorageConnection.h" #include "mozIStorageService.h" #include "mozStorageCID.h" @@ -67,7 +68,7 @@ void DBAction::RunOnTarget( MOZ_DIAGNOSTIC_ASSERT(aDirectoryMetadata); MOZ_DIAGNOSTIC_ASSERT(aDirectoryMetadata->mDir); - if (IsCanceled()) { + if (IsCanceled() || AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownQM)) { aResolver->Resolve(NS_ERROR_ABORT); return; } |