Merge pull request #11613 from t895/import-fix

Android: Initialize TaskViewModel earlier in User Data Activity
dolphin-emu · Mar 1, 2023 · c5e00b0 · c5e00b0
2 parents 211be46 + a4730a9
commit c5e00b0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.kt
@@ -38,6 +38,8 @@ class UserDataActivity : AppCompatActivity() {
     private lateinit var mBinding: ActivityUserDataBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java]
+
         ThemeHelper.setTheme(this)
 
         super.onCreate(savedInstanceState)
@@ -81,7 +83,6 @@ class UserDataActivity : AppCompatActivity() {
     public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
-        taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java]
         if (requestCode == REQUEST_CODE_IMPORT && resultCode == RESULT_OK) {
             val arguments = Bundle()
             arguments.putString(