Merge branch '5.6'

bholliger · Oct 20, 2014 · 207b6d5 · 207b6d5
2 parents 77d6656 + 920d465
commit 207b6d5
Show file tree

Hide file tree

Showing 6 changed files with 402 additions and 363 deletions.
diff --git a/hmailserver/source/Server/IMAP/IMAPNotificationClient.cpp b/hmailserver/source/Server/IMAP/IMAPNotificationClient.cpp
@@ -13,6 +13,7 @@
 #include "../Common/BO/Messages.h"
 #include "../Common/BO/IMAPFolder.h"
 
+#include "../Common/TCPIP/DisconnectedException.h"
 
 #ifdef _DEBUG
 #define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
@@ -94,7 +95,17 @@ namespace HM
          return;
 
       if (parentConnection->GetIsIdling())
-         SendChangeNotification_(notification);
+      {
+         try
+         {
+            SendChangeNotification_(notification);
+         }
+         catch (DisconnectedException&)
+         {
+            // We were unable to send the notifications to the client, because he has disconnected.
+            // This is normal behavior, and not an error we want to log.
+         }
+      }
       else
          CacheChangeNotification_(notification);
    }

diff --git a/hmailserver/source/Tools/Administrator/Dialogs/formConnect.Designer.cs b/hmailserver/source/Tools/Administrator/Dialogs/formConnect.Designer.cs
diff --git a/hmailserver/source/Tools/Administrator/Dialogs/formConnect.cs b/hmailserver/source/Tools/Administrator/Dialogs/formConnect.cs
@@ -185,7 +185,11 @@ private void btnAdd_Click(object sender, EventArgs e)
       {
          formServerInformation serverDlg = new formServerInformation();
 
-         Server server = new Server();
+         Server server = new Server()
+            {
+               userName = "Administrator"
+            };
+
          serverDlg.Server = server;
 
          if (serverDlg.ShowDialog() == DialogResult.OK)