summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2017-05-04 00:06:08 +0200
committerGitHub <noreply@github.com>2017-05-04 00:06:08 +0200
commitd9d8ed64975255dfa756ae04724fd5a66f486055 (patch)
tree18eb77def83ea9b1ddf0f298cef45dea1c47ebad /Source/Android/app/src/main/java
parenteaa4565e6374e6f903863585dedb629f8ba91019 (diff)
parented30caa3dd34d8e8e58a3c03665d8b75f166e7f1 (diff)
Merge pull request #5338 from mahdihijazi/fix_fragment_life_cycle
[Android] Fix crash on the Android TV
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
index 3f235fa1c4..17dad7a41e 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
@@ -46,8 +46,11 @@ public final class TvMainActivity extends Activity implements MainView
setContentView(R.layout.activity_tv_main);
final FragmentManager fragmentManager = getFragmentManager();
- mBrowseFragment = (BrowseFragment) fragmentManager.findFragmentById(
- R.id.fragment_game_list);
+ mBrowseFragment = new BrowseFragment();
+ fragmentManager
+ .beginTransaction()
+ .add(R.id.content, mBrowseFragment, "BrowseFragment")
+ .commit();
// Set display parameters for the BrowseFragment
mBrowseFragment.setHeadersState(BrowseFragment.HEADERS_ENABLED);
@@ -55,7 +58,6 @@ public final class TvMainActivity extends Activity implements MainView
mBrowseFragment.setBadgeDrawable(getResources().getDrawable(
R.drawable.ic_launcher, null));
mBrowseFragment.setBrandColor(getResources().getColor(R.color.dolphin_blue_dark));
-
buildRowsAdapter();
mPresenter.onCreate();