17 lines
754 B
C++
17 lines
754 B
C++
$NetBSD$
|
|
|
|
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2020-07-08 21:41:47.000000000 +0000
|
|
+++ chrome/browser/media_galleries/media_file_system_registry.cc
|
|
@@ -735,7 +735,10 @@ class MediaFileSystemRegistry::MediaFile
|
|
// 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() {
|