ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3503 from sigmabeta/android-rotation-bugfix 

[Android] Don't show screenshot on rotation events
This commit is contained in:
Ryan Houdek 2016-01-12 10:38:44 -05:00
parent 8709e8d2c7 5fef956384
commit d5d6226fbb
1 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -138,6 +138,8 @@ public final class EmulationActivity extends AppCompatActivity
mScreenPath = gameToEmulate.getStringExtra("ScreenPath"); mScreenPath = gameToEmulate.getStringExtra("ScreenPath");
mPosition = gameToEmulate.getIntExtra("GridPosition", -1); mPosition = gameToEmulate.getIntExtra("GridPosition", -1);
if (savedInstanceState == null)
{
Picasso.with(this) Picasso.with(this)
.load(mScreenPath) .load(mScreenPath)
.noFade() .noFade()
@ -180,8 +182,6 @@ public final class EmulationActivity extends AppCompatActivity
} }
}); });
if (savedInstanceState == null)
{
// Instantiate an EmulationFragment. // Instantiate an EmulationFragment.
EmulationFragment emulationFragment = EmulationFragment.newInstance(path); EmulationFragment emulationFragment = EmulationFragment.newInstance(path);
@ -190,6 +190,11 @@ public final class EmulationActivity extends AppCompatActivity
.add(R.id.frame_emulation_fragment, emulationFragment, EmulationFragment.FRAGMENT_TAG) .add(R.id.frame_emulation_fragment, emulationFragment, EmulationFragment.FRAGMENT_TAG)
.commit(); .commit();
} }
else
{
mImageView.setVisibility(View.GONE);
mFrameEmulation.setVisibility(View.VISIBLE);
}
if (mDeviceHasTouchScreen) if (mDeviceHasTouchScreen)
{ {