Merge branch 'develop' into f/invalid_login

2020-02-12 06:41:02 +01:00
parent d663f3ff8f a01c34d999
commit c5389a6af4
23 changed files with 475 additions and 148 deletions
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@ -163,7 +163,7 @@ public class Startup {
 				chatWindow.initContent(client, localDb, writeProxy);

 				// Relay unread messages from cache
-				if (cache != null) cache.relay();
+				if (cache != null && client.isOnline()) cache.relay();

 				try {
 					new StatusTrayIcon(chatWindow).show();