bug fix: better handling of disconnect message in the client

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

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 );
 

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

src/clientdlg.h

@@ -194,7 +194,7 @@ public slots:
         { MainMixerBoard->SetChannelLevels ( vecLevelList ); }
 
     void OnConnectDlgAccepted();
-    void OnDisconnected();
+    void OnDisconnected() { Disconnect(); }
     void OnCentralServerAddressTypeChanged();
 
     void OnGUIDesignChanged()