From a4730a9388a043dd9a983918bab18c058fe18f9e Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 1 Mar 2023 08:28:44 -0500 Subject: [PATCH] Android: Initialize TaskViewModel earlier in User Data Activity --- .../org/dolphinemu/dolphinemu/activities/UserDataActivity.kt | 3 ++- 1 file changed, 2 insertions(+), 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 index 5046e7c7c0..dc11e811fc 100644 --- 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(