| Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| index 3af4df5df9b82d86d688fe8245db0fc7c0aa80eb..942fa2ac9f28d84e261d925dde5bab803710c07f 100644
|
| --- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| @@ -124,7 +124,7 @@ UserSelectionScreen::UserSelectionScreen(const std::string& display_type)
|
| UserSelectionScreen::~UserSelectionScreen() {
|
| proximity_auth::ScreenlockBridge::Get()->SetLockHandler(nullptr);
|
| ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
|
| - if (activity_detector->HasObserver(this))
|
| + if (activity_detector && activity_detector->HasObserver(this))
|
| activity_detector->RemoveObserver(this);
|
| }
|
|
|
| @@ -262,7 +262,7 @@ void UserSelectionScreen::Init(const user_manager::UserList& users,
|
| show_guest_ = show_guest;
|
|
|
| ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
|
| - if (!activity_detector->HasObserver(this))
|
| + if (activity_detector && !activity_detector->HasObserver(this))
|
| activity_detector->AddObserver(this);
|
| }
|
|
|
|
|