diff options
| author | JosJuice <josjuice@gmail.com> | 2023-03-01 17:53:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-01 17:53:59 +0100 |
| commit | c5e00b085e3a56f05e7a6d3a8ae3a9268cd7175e (patch) | |
| tree | 9aebc5139b59cb376b74d3314a7da6afcccc6d96 /Source/Android/app/src/main/java | |
| parent | 211be4698f11b620ba213f74f4018bf7de0d913d (diff) | |
| parent | a4730a9388a043dd9a983918bab18c058fe18f9e (diff) | |
Merge pull request #11613 from t895/import-fix
Android: Initialize TaskViewModel earlier in User Data Activity
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.kt | 3 |
1 files changed, 2 insertions, 1 deletions
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( |