Don't break when showing the login mask to users

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

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 9ddee6d80..f799d8b2e 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -293,8 +293,12 @@ class PageController extends Controller {
 				throw new RoomNotFoundException();
 			}
 		} catch (RoomNotFoundException $e) {
+			$redirectUrl = $this->url->linkToRoute('spreed.Page.index');
+			if ($token) {
+				$redirectUrl = $this->url->linkToRoute('spreed.pagecontroller.showCall', ['token' => $token]);
+			}
 			return new RedirectResponse($this->url->linkToRoute('core.login.showLoginForm', [
-				'redirect_url' => $this->url->linkToRoute('spreed.pagecontroller.showCall', ['token' => $token]),
+				'redirect_url' => $redirectUrl,
 			]));
 		}