trying numeric_limit for user instead of 0

Stykk-Gruppen · Aug 1, 2020 · ab4d47c · ab4d47c
1 parent a5ffd65
commit ab4d47c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/handlers/imagehandler.cpp b/handlers/imagehandler.cpp
@@ -56,15 +56,19 @@ QImage ImageHandler::requestImage(const QString &id, QSize *size, const QSize &r
 void ImageHandler::addPeer(uint8_t index, QString displayName)
 {
     qDebug() << "Added peer to ImageHandler map: " << index;
+    imgLock.lock();
     mImageMap[index].first = generateGenericImage(displayName);
     mImageMap[index].second = displayName;
+    imgLock.unlock();
     emit refreshScreens();
 }
 
 void ImageHandler::removeAllPeers()
 {
     qDebug() << "Removing all peers";
+    imgLock.lock();
     mImageMap.clear();
+    imgLock.unlock();
 }
 
 /**
@@ -75,9 +79,9 @@ void ImageHandler::removeAllPeers()
 void ImageHandler::removePeer(uint8_t index)
 {
     qDebug() << "Removing peer from ImageHandler map: " << index;
-
-    mImageMap.erase(index+1);
-
+    imgLock.lock();
+    mImageMap.erase(index);
+    imgLock.unlock();
     emit refreshScreens();
 }
 

diff --git a/handlers/inputstreamhandler.cpp b/handlers/inputstreamhandler.cpp
@@ -169,8 +169,8 @@ void InputStreamHandler::addStreamToVector(int index, QString streamId, QString
     mAudioPlaybackStartedVector.push_back(false);
     mVideoPlaybackStartedVector.push_back(false);
 
-    //Your own image is at 0, but index 0 in the vectors is NOT you.
-    mImageHandler->addPeer((index + 1), displayName);
+    //Your own image is at numeric limit for uint8, so we have a problem if a room gets that many participants
+    mImageHandler->addPeer(index, displayName);
 }
 
 /**
@@ -204,7 +204,7 @@ int InputStreamHandler::findStreamIdIndex(QString streamId, QString displayName)
 
 void InputStreamHandler::updateParticipantDisplayName(QString streamId, QString displayName)
 {
-    uint8_t index = findStreamIdIndex(streamId, displayName) + 1;
+    uint8_t index = findStreamIdIndex(streamId, displayName);
     mImageHandler->updatePeerDisplayName(index, displayName);
 }