Merge pull request #224 from LuxoftSDL/hotfix/Crash_on_ResetGlobalProperties

Fixes core dump while sending ResetGlobalProperties

1 files changed, 3 insertions, 3 deletions

diff --git a/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc
index 7472324ed9..2e1483eff6 100644
--- a/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc
+++ b/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc
@@ -239,6 +239,9 @@ void ResetGlobalPropertiesRequest::on_event(const event_engine::Event& event) {
   LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
+  ApplicationSharedPtr application =
+      ApplicationManagerImpl::instance()->application(connection_key());
+
   switch (event.id()) {
   case hmi_apis::FunctionID::UI_SetGlobalProperties: {
     LOG4CXX_INFO(logger_, "Received UI_SetGlobalProperties event");
@@ -288,9 +291,6 @@ void ResetGlobalPropertiesRequest::on_event(const event_engine::Event& event) {
     SendResponse(result, static_cast<mobile_apis::Result::eType>(result_code),
                  return_info, &(message[strings::msg_params]));
 
-    ApplicationSharedPtr application =
-        ApplicationManagerImpl::instance()->application(connection_key());
-
     if (!application) {
       LOG4CXX_DEBUG(logger_, "NULL pointer");
       return;