Move app launcher stop before unregister app (#3825)

* Move app launcher stop before unregister app

The applauncher has to be stopped before appropriate application
will be unregistered. Otherwise it could lead to core crash, when
Launch controller will try to run already non existed application

Co-authored-by: Andrii Kalinich <AKalinich@luxoft.com>
Co-authored-by: OlhaVorobiova <olha.vorobiova@dxc.com>
Co-authored-by: VladSemenyuk <vsemenyuk@luxoft.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl_impl.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl_impl.h
index 986f4ad4ff..32cbc46245 100644
--- a/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl_impl.h
+++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl_impl.h
@@ -69,6 +69,7 @@ class AppLaunchCtrlImpl : public AppLaunchCtrl {
   void OnAppRegistered(const application_manager::Application& app) OVERRIDE;
   void OnDeviceConnected(const std::string& device_mac) OVERRIDE;
   void OnMasterReset() OVERRIDE;
+  void Stop() OVERRIDE;
 
  private:
   const AppLaunchSettings& settings_;
@@ -77,6 +78,7 @@ class AppLaunchCtrlImpl : public AppLaunchCtrl {
 
   AppsLauncher apps_launcher_;
   DeviceAppsLauncher device_apps_launcher_;
+  sync_primitives::Lock device_apps_launcher_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLaunchCtrlImpl);
 };