Update chart_pane_controller.dart

polina-c · May 1, 2024 · f132615 · f132615
1 parent 4fc2ff6
commit f132615
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...ges/devtools_app/lib/src/screens/memory/panes/chart/controller/chart_pane_controller.dart b/...ges/devtools_app/lib/src/screens/memory/panes/chart/controller/chart_pane_controller.dart
@@ -53,18 +53,18 @@ class MemoryChartPaneController extends DisposableController
       recomputeChartData();
     }
 
-    _calculateAndroidChartVisibility();
-    addAutoDisposeListener(
-      preferences.memory.androidCollectionEnabled,
-      _calculateAndroidChartVisibility,
-    );
-
     await _onChartVisibilityChanged();
     addAutoDisposeListener(
       isChartVisible,
       () => unawaited(_onChartVisibilityChanged()),
     );
 
+    _calculateAndroidChartVisibility();
+    addAutoDisposeListener(
+      preferences.memory.androidCollectionEnabled,
+      _calculateAndroidChartVisibility,
+    );
+
     _initialized.complete();
   }
 
@@ -116,6 +116,7 @@ class MemoryChartPaneController extends DisposableController
 
   final isAndroidChartVisible = ValueNotifier<bool>(false);
   void _calculateAndroidChartVisibility() {
+    if (!isChartVisible.value) return;
     data.isDeviceAndroid ??= _chartConnection!.isDeviceAndroid;
     isAndroidChartVisible.value = data.isDeviceAndroid! &&
         preferences.memory.androidCollectionEnabled.value;
@@ -124,6 +125,7 @@ class MemoryChartPaneController extends DisposableController
   ValueListenable<bool> get isChartVisible => preferences.memory.showChart;
   Future<void> _onChartVisibilityChanged() async {
     if (isChartVisible.value && await maybeConnect()) resume();
+    _calculateAndroidChartVisibility();
   }
 
   @override