blob: 68454711ea76f0d4cb7fbdb6fe2a4259350ab402 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-10-10 09:15:30 UTC
+++ chrome/browser/media_galleries/media_file_system_registry.cc
@@ -738,7 +738,10 @@
// 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() {
|
