diff options
| author | Conlain Kelly <conlain.k@gmail.com> | 2018-07-24 17:18:21 -0400 |
|---|---|---|
| committer | Conlain Kelly <conlain.k@gmail.com> | 2018-07-24 17:18:21 -0400 |
| commit | 8ff26a734267451030ee8ee62b5f672324a755c9 (patch) | |
| tree | 6b59826fe5cf726ce458eda18e9e20dcb6ce0c58 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands | |
| parent | 0ed004d9a7f961ccb964851dff1266949ebea1ee (diff) | |
| parent | 5bf976c98f56a1d6867114ffe622eff2cc8785fd (diff) | |
| download | sdl_core-8ff26a734267451030ee8ee62b5f672324a755c9.tar.gz | |
Merge branch 'develop' of https://github.com/smartdevicelink/sdl_core into feature/choice_vr_optional
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands')
| -rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h index 285b0b10db..950c295072 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h @@ -142,7 +142,7 @@ class CreateInteractionChoiceSetRequest volatile bool is_timed_out_; sync_primitives::Lock is_timed_out_lock_; - sync_primitives::Lock vr_commands_lock_; + sync_primitives::RecursiveLock vr_commands_lock_; /* * @brief Sends VR AddCommand request to HMI * |