summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/chromeos/login/wizard_controller.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index a8adf9c..fdbadf1 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -836,7 +836,9 @@ void WizardController::AutoLaunchKioskApp() {
KioskAppManager::App app_data;
std::string app_id = KioskAppManager::Get()->GetAutoLaunchApp();
CHECK(KioskAppManager::Get()->GetApp(app_id, &app_data));
- ExistingUserController::current_controller()->PrepareKioskAppLaunch();
+ if (ExistingUserController::current_controller())
+ ExistingUserController::current_controller()->PrepareKioskAppLaunch();
+
// KioskAppLauncher deletes itself when done.
(new KioskAppLauncher(KioskAppManager::Get(), app_id))->Start();
}