diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2021-11-08 15:14:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 15:14:25 -0500 |
| commit | 3ca6d944a42d6abf96be9a4a5265e69498091918 (patch) | |
| tree | 32c0fba12953e82da1978727fd7b4a3a548a7701 | |
| parent | a626f4205e5f6aaefb29b38336b75524d1a3643f (diff) | |
| download | sdl_core-3ca6d944a42d6abf96be9a4a5265e69498091918.tar.gz | |
Reset display_capabilities_ pointer after merging capabilities (#3812)
| -rw-r--r-- | src/components/application_manager/src/application_data_impl.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/components/application_manager/src/application_data_impl.cc b/src/components/application_manager/src/application_data_impl.cc index 1d6ea8afe8..57f7932246 100644 --- a/src/components/application_manager/src/application_data_impl.cc +++ b/src/components/application_manager/src/application_data_impl.cc @@ -610,8 +610,7 @@ void DynamicApplicationDataImpl::set_display_capabilities( (*display_capabilities_)[0][strings::window_capabilities]; } - display_capabilities_.reset( - new smart_objects::SmartObject(display_capabilities)); + smart_objects::SmartObject merged_capabilities = display_capabilities; auto get_window_index = [&tmp_window_capabilities](const WindowID window_id) { const auto tmp_window_capabilities_arr = tmp_window_capabilities.asArray(); @@ -647,8 +646,11 @@ void DynamicApplicationDataImpl::set_display_capabilities( } } - (*display_capabilities_)[0][strings::window_capabilities] = + merged_capabilities[0][strings::window_capabilities] = tmp_window_capabilities; + + display_capabilities_.reset( + new smart_objects::SmartObject(merged_capabilities)); } void DynamicApplicationDataImpl::remove_window_capability( |