From 534d5769bfa1346f76a3041eda3fd6f3d8bcebcc Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Mon, 25 May 2020 21:49:30 +0900 Subject: [PATCH] Add NULL check when prelaunching default assistant Change-Id: Id8d6fa2323000101f4edd8ce33ab99d1bb8cae29 --- src/service_main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/service_main.cpp b/src/service_main.cpp index 966c336..4dda21b 100644 --- a/src/service_main.cpp +++ b/src/service_main.cpp @@ -950,7 +950,8 @@ int CServiceMain::prelaunch_default_assistant() if (prelaunch_mode && *prelaunch_mode) { const char *default_assistant = NULL; if (0 == mServicePlugin.get_default_assistant(&default_assistant)) { - if (!(mApplicationManager.is_application_running(default_assistant))) { + if (default_assistant && + !(mApplicationManager.is_application_running(default_assistant))) { MAS_LOGD("prelaunching default_assistant_appid : %s", default_assistant); launch_client_by_appid(default_assistant, CLIENT_LAUNCH_MODE_PRELAUNCH); } -- 2.34.1