web/repertory/lib/models/mount.dart

@@ -10,8 +10,6 @@ class Mount with ChangeNotifier {
   final MountConfig mountConfig;
   final MountList? _mountList;
   bool _isMounting = false;
-  bool _isRefreshing = false;
-
   Mount(this.mountConfig, this._mountList, {isAdd = false}) {
     if (isAdd) {
       return;
@@ -44,11 +42,8 @@ class Mount with ChangeNotifier {
         return;
       }
 
-      if (_isMounting) {
-        return;
-      }
-
       mountConfig.updateSettings(jsonDecode(response.body));
+
       notifyListeners();
     } catch (e) {
       debugPrint('$e');
@@ -74,10 +69,6 @@ class Mount with ChangeNotifier {
         return;
       }
 
-      if (_isMounting) {
-        return;
-      }
-
       mountConfig.updateStatus(jsonDecode(response.body));
       notifyListeners();
     } catch (e) {
@@ -92,11 +83,6 @@ class Mount with ChangeNotifier {
       mountConfig.mounted = null;
       notifyListeners();
 
-      var count = 0;
-      while (_isRefreshing && count++ < 10) {
-        await Future.delayed(Duration(seconds: 1));
-      }
-
       final response = await http.post(
         Uri.parse(
           Uri.encodeFull(
@@ -126,20 +112,12 @@ class Mount with ChangeNotifier {
   }
 
   Future<void> refresh({bool force = false}) async {
-    if (!force && (_isMounting || _isRefreshing)) {
+    if (!force && _isMounting) {
       return;
     }
 
-    _isRefreshing = true;
+    await _fetch();
-
+    return _fetchStatus();
-    try {
-      await _fetch();
-      await _fetchStatus();
-    } catch (e) {
-      debugPrint('$e');
-    }
-
-    _isRefreshing = false;
   }
 
   Future<void> setValue(String key, String value) async {

web/repertory/lib/widgets/mount_widget.dart

@@ -102,6 +102,7 @@ class _MountWidgetState extends State<MountWidget> {
           }
 
           final success = await mount.mount(mount.mounted!, location: location);
+
           if (success ||
               mount.mounted! ||
               constants.navigatorKey.currentContext == null ||
@@ -110,7 +111,7 @@ class _MountWidgetState extends State<MountWidget> {
           }
 
           displayErrorMessage(context, "Mount location is not available");
-          cleanup();
+          return cleanup();
         }
         : null;
   }