Merge pull request #3943 from smartdevicelink/fix/prepare_result_3_args

Fix PrepareResultForMobileResponse logic

1 files changed, 10 insertions, 3 deletions

diff --git a/src/components/application_manager/src/commands/request_from_mobile_impl.cc b/src/components/application_manager/src/commands/request_from_mobile_impl.cc
index 77cfd305fa..2e81ae5aea 100644
--- a/src/components/application_manager/src/commands/request_from_mobile_impl.cc
+++ b/src/components/application_manager/src/commands/request_from_mobile_impl.cc
@@ -660,9 +660,16 @@ bool RequestFromMobileImpl::PrepareResultForMobileResponse(
     ResponseInfo& out_second,
     ResponseInfo& out_third) const {
   SDL_LOG_AUTO_TRACE();
-  bool result = (PrepareResultForMobileResponse(out_first, out_second) ||
-                 PrepareResultForMobileResponse(out_second, out_third)) ||
-                PrepareResultForMobileResponse(out_first, out_third);
+  bool result_first_second =
+      PrepareResultForMobileResponse(out_first, out_second);
+  bool result_second_third =
+      PrepareResultForMobileResponse(out_second, out_third);
+  bool result_first_third =
+      PrepareResultForMobileResponse(out_first, out_third);
+
+  bool result = (result_first_second && result_first_third) ||
+                (result_second_third && result_first_second) ||
+                (result_second_third && result_first_third);
   return result;
 }