blob: 232045b7369fd4c8ddd403d72e566e30dd0e34a0 (
plain) (
tree)
|
|
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2024-01-30 07:53:34 UTC
+++ chrome/browser/media_galleries/media_file_system_registry.cc
@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
// Constructor in 'private' section because depends on private class definition.
MediaFileSystemRegistry::MediaFileSystemRegistry()
: file_system_context_(new MediaFileSystemContextImpl) {
- StorageMonitor::GetInstance()->AddObserver(this);
+ /*
+ * This conditional is needed for shutdown. Destructors
+ * try to get the media file system registry.
+ */
+ if (StorageMonitor::GetInstance())
+ StorageMonitor::GetInstance()->AddObserver(this);
}
MediaFileSystemRegistry::~MediaFileSystemRegistry() {
|