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 #4069 from sigmabeta/android-fix-crash 

Fix crash introduced by input config code
This commit is contained in:
Markus Wick 2016-07-30 15:54:43 +02:00 committed by GitHub
parent be9416c462 8724df3b70
commit fef0ff85b9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
View File

@ -105,14 +105,17 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
public void onViewCreated(View view, Bundle savedInstanceState)
{
Button doneButton = (Button) view.findViewById(R.id.done_control_config);
doneButton.setOnClickListener(new View.OnClickListener()
if (doneButton != null)
{
@Override
public void onClick(View v)
doneButton.setOnClickListener(new View.OnClickListener()
{
stopConfiguringControls();
}
});
@Override
public void onClick(View v)
{
stopConfiguringControls();
}
});
}
}
@Override