fix(vt): correctly scope lock guard + add missing iterate-to-next in …

…for loop
Open-Agriculture · Mar 15, 2024 · 704ee84 · 704ee84
1 parent 6edc33d
commit 704ee84
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/isobus/src/isobus_virtual_terminal_client.cpp b/isobus/src/isobus_virtual_terminal_client.cpp
@@ -4503,11 +4503,11 @@ namespace isobus
 			return true;
 		}
 
+		LOCK_GUARD(Mutex, commandQueueMutex);
 		if (replace && replace_command(data))
 		{
 			return true;
 		}
-		LOCK_GUARD(Mutex, commandQueueMutex);
 		commandQueue.emplace_back(data);
 		return true;
 	}
@@ -4531,6 +4531,10 @@ namespace isobus
 					it = commandQueue.erase(it);
 				}
 			}
+			else
+			{
+				it++;
+			}
 		}
 		return alreadyReplaced;
 	}