From bc628f00e79bc154793ed6440e94793e123b0f11 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@teaspeak.de>
Date: Sat, 1 Aug 2020 13:07:33 +0200
Subject: [PATCH] Merged with master and fixed some minor issues

---
 shared/html/templates.html                             | 4 ++--
 shared/js/ui/frames/side/ConversationManager.ts        | 4 ++--
 shared/js/ui/frames/side/PrivateConversationHistory.ts | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/shared/html/templates.html b/shared/html/templates.html
index fcfe0458..5a4a7241 100644
--- a/shared/html/templates.html
+++ b/shared/html/templates.html
@@ -1890,8 +1890,8 @@
                     </div>
                     <div class="container general-updates">{{tr "GU" /}}</div>
                     <div class="container general-keymap"></div>
-                    <div class="container general-chat"></div>
-                    <div class="container general-notifications">
+                    <div class="container general-notifications"></div>
+                    <div class="container general-chat">
                         <label>
                             <div class="checkbox">
                                 <input type="checkbox" class="option-fixed-timestamps">
diff --git a/shared/js/ui/frames/side/ConversationManager.ts b/shared/js/ui/frames/side/ConversationManager.ts
index 7625a07f..d3e4216a 100644
--- a/shared/js/ui/frames/side/ConversationManager.ts
+++ b/shared/js/ui/frames/side/ConversationManager.ts
@@ -743,7 +743,8 @@ export class ConversationManager extends AbstractChatManager<ConversationUIEvent
     }
 
     setSelectedConversation(id: number) {
-        this.findOrCreateConversation(id);
+        if(id >= 0)
+            this.findOrCreateConversation(id);
 
         this.uiEvents.fire("notify_selected_chat", { chatId: id.toString() });
     }
@@ -798,7 +799,6 @@ export class ConversationManager extends AbstractChatManager<ConversationUIEvent
             return;
         }
 
-
         for(const entry of command.arguments) {
             conversation.historyQueryResponse.push({
                 timestamp: parseInt(entry["timestamp"]),
diff --git a/shared/js/ui/frames/side/PrivateConversationHistory.ts b/shared/js/ui/frames/side/PrivateConversationHistory.ts
index 46094ca9..22848cb5 100644
--- a/shared/js/ui/frames/side/PrivateConversationHistory.ts
+++ b/shared/js/ui/frames/side/PrivateConversationHistory.ts
@@ -230,8 +230,13 @@ loader.register_task(Stage.JAVASCRIPT_INITIALIZING, {
             throw tr("Missing Indexed DB support");
         }
 
-        await doOpenDatabase(false);
-        log.debug(LogCategory.CHAT, tr("Successfully initialized private conversation history database"));
+        try {
+            await doOpenDatabase(false);
+            log.debug(LogCategory.CHAT, tr("Successfully initialized private conversation history database"));
+        } catch (error) {
+            log.error(LogCategory.CHAT, tr("Failed to initialize private conversation history database: %o"), error);
+            log.error(LogCategory.CHAT, tr("Do not saving the private conversation chat."));
+        }
     }
 });