Skip to content

Fix LAN service cleanup after disconnect #958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
calcitem wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix LAN service cleanup after disconnect #958

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/ui/flutter_app/lib/game_page/services/network/network_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ class NetworkService with WidgetsBindingObserver {
}

_notifyConnectionStatusChanged(false, info: userFriendlyMessage);
_disposeInternals();
_disposeInternals(markDisposed: false);
onDisconnected?.call();
}

Expand All @@ -955,13 +955,14 @@ class NetworkService with WidgetsBindingObserver {
}
WidgetsBinding.instance.removeObserver(this);
logger.i("$_logTag dispose() called");
_disposeInternals();
_disposeInternals(markDisposed: true);
}

void _disposeInternals() {
if (_disposed) {
void _disposeInternals({bool markDisposed = false}) {
if (_disposed && !markDisposed) {
return;
}
final bool previousDisposed = _disposed;
_disposed = true;

try {
Expand Down Expand Up @@ -1000,11 +1001,23 @@ class NetworkService with WidgetsBindingObserver {

_messageQueue.clear();
_isProcessingMessages = false;
if (_protocolHandshakeCompleter != null &&
!_protocolHandshakeCompleter!.isCompleted) {
_protocolHandshakeCompleter!.complete(false);
}
_protocolHandshakeCompleter = null;
_heartbeatStarted = false;
_isReconnecting = false;

logger.i("$_logTag Network disposed");
if (!markDisposed) {
_disposed = false;
logger.i("$_logTag Network resources reset after disconnect");
} else {
_disposed = true;
if (!previousDisposed) {
logger.i("$_logTag Network disposed");
}
}
}

/// Returns the first non-loopback IPv4 address, or null if not found.
Expand Down
Loading