Fix session handling so lobby can kick you correctly

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/Middleware/InjectionMiddleware.php b/lib/Middleware/InjectionMiddleware.php
index 5ef6d17ba..3e12c8484 100644
--- a/lib/Middleware/InjectionMiddleware.php
+++ b/lib/Middleware/InjectionMiddleware.php
@@ -139,11 +139,11 @@ class InjectionMiddleware extends Middleware {
 		$room = $this->manager->getRoomForUserByToken($token, $this->userId);
 		$controller->setRoom($room);
 
-		if ($this->userId !== null) {
-			$participant = $room->getParticipant($this->userId);
-		} else {
-			$sessionId = $this->talkSession->getSessionForRoom($token);
+		$sessionId = $this->talkSession->getSessionForRoom($token);
+		if ($sessionId !== null) {
 			$participant = $room->getParticipantBySession($sessionId);
+		} else {
+			$participant = $room->getParticipant($this->userId);
 		}
 		$controller->setParticipant($participant);