From 34cccac29fc683c1836640f16f82ee6f63956b0a Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Tue, 12 May 2020 18:12:45 +0200
Subject: [PATCH] bug fix: better handling of disconnect message in the client

---
 ChangeLog         |  4 ++--
 src/client.h      |  2 +-
 src/clientdlg.cpp | 10 ----------
 src/clientdlg.h   |  2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3bb8fc39..2475f32c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,13 +26,13 @@
 
 - bug fix: fixed that Jamulus segfaults when jackd is restarted (Ticket #122, #127)
 
+- bug fix: better handling of disconnect message in the client
+
 
 TODO check if Tickets #130, #168 are really solved by code from pljones
 
 TODO WIP support internationalization
 
-TODO improve disconnect message behaviour on client
-
 TODO implement panning for channels (Ticket #52, #145)
 
 TODO show mute state of others
diff --git a/src/client.h b/src/client.h
index 76df0702..1b16000c 100755
--- a/src/client.h
+++ b/src/client.h
@@ -398,7 +398,7 @@ public slots:
     void OnJittBufSizeChanged ( int iNewJitBufSize );
     void OnReqChanInfo() { Channel.SetRemoteInfo ( ChannelInfo ); }
     void OnNewConnection();
-    void OnCLDisconnection ( CHostAddress InetAddr ) { if ( InetAddr == Channel.GetAddress() ) { Stop(); } }
+    void OnCLDisconnection ( CHostAddress InetAddr ) { if ( InetAddr == Channel.GetAddress() ) { emit Disconnected(); } }
     void OnCLPingReceived ( CHostAddress InetAddr,
                             int          iMs );
 
diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
index ab178cd4..1f1fe8a2 100755
--- a/src/clientdlg.cpp
+++ b/src/clientdlg.cpp
@@ -732,16 +732,6 @@ void CClientDlg::OnConnectDisconBut()
     }
 }
 
-void CClientDlg::OnDisconnected()
-{
-    // channel is now disconnected, clear mixer board (remove all faders) and
-    // reset the delay LED (since this is only updated on an active connection)
-    MainMixerBoard->HideAll();
-    ledDelay->Reset();
-
-    UpdateDisplay();
-}
-
 void CClientDlg::OnCentralServerAddressTypeChanged()
 {
     // if the server list is shown and the server type was changed, update the list
diff --git a/src/clientdlg.h b/src/clientdlg.h
index b87a925f..d4a7b2b9 100755
--- a/src/clientdlg.h
+++ b/src/clientdlg.h
@@ -194,7 +194,7 @@ public slots:
         { MainMixerBoard->SetChannelLevels ( vecLevelList ); }
 
     void OnConnectDlgAccepted();
-    void OnDisconnected();
+    void OnDisconnected() { Disconnect(); }
     void OnCentralServerAddressTypeChanged();
 
     void OnGUIDesignChanged()