diff --git a/lib/screens/companion_radio_stats_screen.dart b/lib/screens/companion_radio_stats_screen.dart index 78618036..748f4a20 100644 --- a/lib/screens/companion_radio_stats_screen.dart +++ b/lib/screens/companion_radio_stats_screen.dart @@ -79,10 +79,15 @@ class _CompanionRadioStatsScreenState extends State { title: Text(l10n.radioStats_screenTitle), centerTitle: true, actions: [ - IconButton( - icon: const Icon(Icons.thermostat), - tooltip: l10n.contact_telemetry, - onPressed: () => pushSelfTelemetryScreen(context), + Selector( + selector: (_, c) => c.isConnected, + builder: (context, connected, _) => IconButton( + icon: const Icon(Icons.thermostat), + tooltip: l10n.contact_telemetry, + onPressed: connected + ? () => pushSelfTelemetryScreen(context) + : null, + ), ), ], ), diff --git a/lib/screens/telemetry_screen.dart b/lib/screens/telemetry_screen.dart index 10b68592..76cff5be 100644 --- a/lib/screens/telemetry_screen.dart +++ b/lib/screens/telemetry_screen.dart @@ -275,10 +275,13 @@ class _TelemetryScreenState extends State { frame = buildSendTelemetryReq(widget.contact.publicKey); } } - _awaitingSent = true; + // A local self request gets no respCodeSent, so any that arrives belongs + // to another send and must not replace the 5s self timeout. + _awaitingSent = !widget.isSelf; await connector.sendFrame(frame); } catch (e) { _awaitingSent = false; + _statusTimeout?.cancel(); if (mounted) { setState(() { _isLoading = false;