network: Move global state into a seperate class

Co-Authored-By: Narr the Reg <5944268+german77@users.noreply.github.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/yuzu/multiplayer/client_room.cpp b/src/yuzu/multiplayer/client_room.cpp
index 7b2e16e06..9bef9bdfc 100644
--- a/src/yuzu/multiplayer/client_room.cpp
+++ b/src/yuzu/multiplayer/client_room.cpp
@@ -19,13 +19,14 @@
 #include "yuzu/multiplayer/moderation_dialog.h"
 #include "yuzu/multiplayer/state.h"
 
-ClientRoomWindow::ClientRoomWindow(QWidget* parent)
+ClientRoomWindow::ClientRoomWindow(QWidget* parent, Network::RoomNetwork& room_network_)
     : QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint),
-      ui(std::make_unique<Ui::ClientRoom>()) {
+      ui(std::make_unique<Ui::ClientRoom>()), room_network{room_network_} {
     ui->setupUi(this);
+    ui->chat->Initialize(&room_network);
 
     // setup the callbacks for network updates
-    if (auto member = Network::GetRoomMember().lock()) {
+    if (auto member = room_network.GetRoomMember().lock()) {
         member->BindOnRoomInformationChanged(
             [this](const Network::RoomInformation& info) { emit RoomInformationChanged(info); });
         member->BindOnStateChanged(
@@ -44,7 +45,7 @@ ClientRoomWindow::ClientRoomWindow(QWidget* parent)
     ui->disconnect->setDefault(false);
     ui->disconnect->setAutoDefault(false);
     connect(ui->moderation, &QPushButton::clicked, [this] {
-        ModerationDialog dialog(this);
+        ModerationDialog dialog(room_network, this);
         dialog.exec();
     });
     ui->moderation->setDefault(false);
@@ -91,7 +92,7 @@ void ClientRoomWindow::Disconnect() {
 }
 
 void ClientRoomWindow::UpdateView() {
-    if (auto member = Network::GetRoomMember().lock()) {
+    if (auto member = room_network.GetRoomMember().lock()) {
         if (member->IsConnected()) {
             ui->chat->Enable();
             ui->disconnect->setEnabled(true);