Skip to content

Commit

Permalink
Merge branch 'ajaus/fix_deadlock_due_to_improper_reset_flag_raising' …
Browse files Browse the repository at this point in the history
…into 'main'

\[REMIX-2576\]Fixes a deadlock issue in the bridge.

See merge request lightspeedrtx/bridge-remix-nv!73
  • Loading branch information
nv-ajaus committed Feb 16, 2024
2 parents 584a896 + ac366ae commit 667869b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/util/util_bridgecommand.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class Bridge {
inline void send_data(const DataT size, const void* obj) {
ZoneScoped;
if (gbBridgeRunning) {
size_t memUsed = align<size_t>(size, sizeof(DataT)) / sizeof(DataT) + 1;
size_t memUsed = (obj == nullptr) ? 1 : (align<size_t>(size, sizeof(DataT)) / sizeof(DataT)) + 1;
syncDataQueue(memUsed, true);
const auto result = s_pWriterChannel->data->push(size, obj);
if (RESULT_FAILURE(result)) {
Expand Down

0 comments on commit 667869b

Please sign in to comment.