1 files changed, 9 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/netplay/model/NetplaySetupViewModel.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/netplay/model/NetplaySetupViewModel.kt
index 34cee1e5bf..5ede907e85 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/netplay/model/NetplaySetupViewModel.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/netplay/model/NetplaySetupViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import org.dolphinemu.dolphinemu.features.netplay.Netplay
+import org.dolphinemu.dolphinemu.services.GameFileCacheManager
 
 class NetplaySetupViewModel : ViewModel() {
     private val _connectionRole = MutableStateFlow<ConnectionRole>(ConnectionRole.Connect)
@@ -26,6 +27,10 @@ class NetplaySetupViewModel : ViewModel() {
     private val _connectPort = MutableStateFlow(Netplay.getConnectPort().toString())
     val connectPort = _connectPort.asStateFlow()
 
+    init {
+        GameFileCacheManager.startLoad()
+    }
+
     fun setConnectionRole(connectionRole: ConnectionRole) {
         _connectionRole.value = connectionRole
     }
@@ -55,6 +60,10 @@ class NetplaySetupViewModel : ViewModel() {
     }
 
     fun connect() {
+        if (GameFileCacheManager.isLoading().value == true) {
+            return
+        }
+
         Netplay.saveSetup(
             nickname = nickname.value,
             connectionType = connectionType.value,