diff options
| author | Collin <iCollin@users.noreply.github.com> | 2022-01-31 15:00:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 15:00:50 -0500 |
| commit | 66671405f37bcfecfccc221d38106af9f61f773d (patch) | |
| tree | ec43caed6ee56f6c93558ff9237d1e460de1e559 | |
| parent | 29f009648977bf73cce52148ff63c761c028eac9 (diff) | |
| download | sdl_core-release/4.5.3.tar.gz | |
destroy DeviceAppsLauncherImpl when parent DeviceAppsLauncher is destroyed (#3848)4.5.3release/4.5.3
* destroy DeviceAppsLauncherImpl ptr impl_ when parent DeviceAppsLauncher is destroyed
* Update src/components/application_manager/src/app_launch/device_apps_launcher.cc
* Update src/components/application_manager/src/app_launch/device_apps_launcher.cc
* update to new boost download
3 files changed, 8 insertions, 2 deletions
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index b97c05f7f9..184aa18744 100644 --- a/src/3rd_party/CMakeLists.txt +++ b/src/3rd_party/CMakeLists.txt @@ -222,7 +222,7 @@ if (HMIADAPTER STREQUAL "messagebroker") include(ExternalProject) ExternalProject_Add( Boost - URL https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz + URL https://boostorg.jfrog.io/artifactory/main/release/1.66.0/source/boost_1_66_0.tar.gz DOWNLOAD_DIR ${BOOST_LIB_SOURCE_DIRECTORY} SOURCE_DIR ${BOOST_LIB_SOURCE_DIRECTORY} CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=system --prefix=${3RD_PARTY_INSTALL_PREFIX} diff --git a/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h b/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h index f1f29471e6..ad103790a8 100644 --- a/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h +++ b/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h @@ -25,6 +25,7 @@ class DeviceAppsLauncher { DeviceAppsLauncher(application_manager::ApplicationManager& app_mngr, app_launch::AppsLauncher& apps_launcher, const AppLaunchSettings& settings); + ~DeviceAppsLauncher(); bool LaunchAppsOnDevice( const std::string& device_mac, @@ -36,7 +37,7 @@ class DeviceAppsLauncher { private: application_manager::ApplicationManager& app_mngr_; const AppLaunchSettings& settings_; - std::auto_ptr<DeviceAppsLauncherImpl> impl_; + DeviceAppsLauncherImpl* impl_; friend class DeviceAppsLauncherImpl; DISALLOW_COPY_AND_ASSIGN(DeviceAppsLauncher); }; diff --git a/src/components/application_manager/src/app_launch/device_apps_launcher.cc b/src/components/application_manager/src/app_launch/device_apps_launcher.cc index 0eb9245cf8..196ef6f5e8 100644 --- a/src/components/application_manager/src/app_launch/device_apps_launcher.cc +++ b/src/components/application_manager/src/app_launch/device_apps_launcher.cc @@ -196,6 +196,11 @@ DeviceAppsLauncher::DeviceAppsLauncher( , settings_(settings) , impl_(new DeviceAppsLauncherImpl(*this, apps_launcher)) {} +DeviceAppsLauncher::~DeviceAppsLauncher() { + delete impl_; + impl_ = nullptr; +} + bool DeviceAppsLauncher::StopLaunchingAppsOnDevice( const std::string& device_mac) { return impl_->StopLaunchingAppsOnDevice(device_mac); |