Skip to content

Commit

Permalink
PR #12773 from Nir-Az: Cherry Pick PR 12772
Browse files Browse the repository at this point in the history
  • Loading branch information
Nir-Az authored Mar 20, 2024
2 parents a402c31 + 031c157 commit 3c93827
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions common/subdevice-model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ namespace rs2

return res;
}

// The function returns true if one of the configuration parameters changed
bool subdevice_model::draw_stream_selection(std::string& error_message)
{
bool res = false;
Expand All @@ -995,7 +995,7 @@ namespace rs2
{
if (draw_fps_selector)
{
res &= draw_fps(error_message, label, streaming_tooltip, col0, col1);
res |= draw_fps(error_message, label, streaming_tooltip, col0, col1);
}

if (draw_streams_selector)
Expand All @@ -1005,21 +1005,21 @@ namespace rs2
ImGui::Text("Available Streams:");
}

res &= draw_res_stream_formats(error_message, label, streaming_tooltip, col0, col1);
res |= draw_res_stream_formats(error_message, label, streaming_tooltip, col0, col1);
}
}
else
{
res &= draw_resolutions(error_message, label, streaming_tooltip, col0, col1);
res |= draw_resolutions(error_message, label, streaming_tooltip, col0, col1);

if (draw_fps_selector)
{
res &= draw_fps(error_message, label, streaming_tooltip, col0, col1);
res |= draw_fps(error_message, label, streaming_tooltip, col0, col1);
}

if (draw_streams_selector)
{
res &= draw_streams_and_formats(error_message, label, streaming_tooltip, col0, col1);
res |= draw_streams_and_formats(error_message, label, streaming_tooltip, col0, col1);
}
}

Expand Down

0 comments on commit 3c93827

Please sign in to comment.