izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanups to "firewalled" quit scenario.

Browse Source
This commit is contained in:
Keith Winstein
2012-05-23 12:05:59 -04:00
parent c0a8cd61ee
commit b9ed0cdaa6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/stmclient.cc
+3 -2
View File
@@ -388,11 +388,12 @@ void STMClient::main( void )
&& (timestamp() - network->get_latest_remote_state().timestamp > 250) ) { && (timestamp() - network->get_latest_remote_state().timestamp > 250) ) {
if ( timestamp() - network->get_latest_remote_state().timestamp > 15000 ) { if ( timestamp() - network->get_latest_remote_state().timestamp > 15000 ) {
if ( !network->shutdown_in_progress() ) { if ( !network->shutdown_in_progress() ) {
overlays.get_notification_engine().set_notification_string( wstring( L"Timed out waiting for server, exiting..." ), true ); overlays.get_notification_engine().set_notification_string( wstring( L"Timed out waiting for server..." ), true );
network->start_shutdown(); network->start_shutdown();
} }
} } else {
overlays.get_notification_engine().set_notification_string( connecting_notification ); overlays.get_notification_engine().set_notification_string( connecting_notification );
}
} else if ( (network->get_remote_state_num() != 0) } else if ( (network->get_remote_state_num() != 0)
&& (overlays.get_notification_engine().get_notification_string() && (overlays.get_notification_engine().get_notification_string()
== connecting_notification) ) { == connecting_notification) ) {