From aed30b805bafe07d9d16809e11965a0d7b1f90c4 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@did.science>
Date: Sat, 26 Sep 2020 23:17:01 +0200
Subject: [PATCH] Fixed error on local client enter

---
 shared/js/tree/ChannelTree.tsx                  | 2 +-
 shared/js/ui/frames/side/ConversationManager.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/js/tree/ChannelTree.tsx b/shared/js/tree/ChannelTree.tsx
index d7b550bb..0447e3ce 100644
--- a/shared/js/tree/ChannelTree.tsx
+++ b/shared/js/tree/ChannelTree.tsx
@@ -70,7 +70,7 @@ export interface ChannelTreeEvents {
     },
     notify_client_moved: {
         client: ClientEntry,
-        oldChannel: ChannelEntry,
+        oldChannel: ChannelEntry | undefined,
         newChannel: ChannelEntry
     }
     notify_client_leave_view: {
diff --git a/shared/js/ui/frames/side/ConversationManager.ts b/shared/js/ui/frames/side/ConversationManager.ts
index 1c92bacf..40dd86eb 100644
--- a/shared/js/ui/frames/side/ConversationManager.ts
+++ b/shared/js/ui/frames/side/ConversationManager.ts
@@ -330,7 +330,7 @@ export class ConversationManager extends AbstractChatManager<ConversationUIEvent
 
         connection.events().one("notify_handler_initialized", () => this.uiEvents.on("notify_destroy", connection.channelTree.events.on("notify_client_moved", event => {
             if(event.client instanceof LocalClientEntry) {
-                this.findOrCreateConversation(event.oldChannel.channelId).localClientSwitchedChannel("leave");
+                event.oldChannel && this.findOrCreateConversation(event.oldChannel.channelId).localClientSwitchedChannel("leave");
                 this.findOrCreateConversation(event.newChannel.channelId).localClientSwitchedChannel("join");
             }
         })));