From 16ed5e32706f431bf8e3d16c9a570006d376c017 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 19 Jul 2021 15:01:43 +0200
Subject: [PATCH] update to bugfix

---
 src/osal/freertos/QueueMapManager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/osal/freertos/QueueMapManager.cpp b/src/osal/freertos/QueueMapManager.cpp
index e32cbe1d..7d6b2f12 100644
--- a/src/osal/freertos/QueueMapManager.cpp
+++ b/src/osal/freertos/QueueMapManager.cpp
@@ -17,10 +17,12 @@ QueueMapManager* QueueMapManager::instance() {
 
 ReturnValue_t QueueMapManager::addMessageQueue(QueueHandle_t queue, MessageQueueId_t* id) {
     MutexGuard lock(mapLock);
-    uint32_t currentId = queueCounter++;
+    uint32_t currentId = queueCounter;
+    queueCounter++;
     if(currentId == MessageQueueIF::NO_QUEUE) {
         // Skip the NO_QUEUE value
-        currentId = queueCounter++;
+        currentId = queueCounter;
+        queueCounter++;
     }
     auto returnPair = queueMap.emplace(currentId, queue);
     if(not returnPair.second) {