From 471225f7fa993d4137c6c3357abf087a59db0272 Mon Sep 17 00:00:00 2001
From: NyxiumYuuki <ATAWV5n2q8KG3kn>
Date: Tue, 1 Jun 2021 23:03:36 +0200
Subject: [PATCH] Debug room was not changed so we could send messages from
 last room

---
 frontend/src/app/message/message.component.html | 7 ++++---
 frontend/src/app/message/message.component.ts   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/message/message.component.html b/frontend/src/app/message/message.component.html
index 9e60a2f..d6ea7fb 100644
--- a/frontend/src/app/message/message.component.html
+++ b/frontend/src/app/message/message.component.html
@@ -2,10 +2,11 @@
     <div class="chat-header">
       <p class="username" *ngIf="room !== 'general'">{{room}}</p>
       <p class="username" *ngIf="room === 'general'">General</p>
+      <p class="username" *ngIf="room === ''">PLEASE CHOOSE A ROOM</p>
       <div class="pull-right">
-        <input *ngIf="room !== 'general' && typeRoom === true" class="btn btn-sm btn-primary" name="button-change-private" (click)="addMember()"  type="submit" value="+">
-        <input *ngIf="room !== 'general' && typeRoom === true" class="btn btn-sm btn-primary" name="button-change-private" (click)="removeMember()"  type="submit" value="-">
-        <input *ngIf="room !== 'general' && typeRoom === true" class="btn btn-sm btn-primary" name="button-change-private" (click)="listMembers()"  type="submit" value="Members">
+        <input *ngIf="room !== '' && room !== 'general' && typeRoom === true" class="btn btn-sm btn-primary" name="button-change-private" (click)="addMember()"  type="submit" value="+">
+        <input *ngIf="room !== '' && room !== 'general' && typeRoom === true" class="btn btn-sm btn-primary" name="button-change-private" (click)="removeMember()"  type="submit" value="-">
+        <input *ngIf="room !== '' && room !== 'general' && typeRoom === true" class="btn btn-sm btn-primary" name="button-change-private" (click)="listMembers()"  type="submit" value="Members">
       </div>
     </div>
     <div #scrollContainer class="chat-body" >
diff --git a/frontend/src/app/message/message.component.ts b/frontend/src/app/message/message.component.ts
index a6311a9..dad06c4 100644
--- a/frontend/src/app/message/message.component.ts
+++ b/frontend/src/app/message/message.component.ts
@@ -47,7 +47,7 @@ export class MessageComponent implements OnInit, OnChanges {
       this.chatservice.setRoom(this.room);
       this.chatServiceOnNewMessage(this.room);
     }
-    else{
+    else if(this.room !== ''){
       let dataMessage;
       if(this.typeRoom){
         dataMessage = {