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
commit fef0ff85b9

View File

@ -105,6 +105,8 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
public void onViewCreated(View view, Bundle savedInstanceState) public void onViewCreated(View view, Bundle savedInstanceState)
{ {
Button doneButton = (Button) view.findViewById(R.id.done_control_config); Button doneButton = (Button) view.findViewById(R.id.done_control_config);
if (doneButton != null)
{
doneButton.setOnClickListener(new View.OnClickListener() doneButton.setOnClickListener(new View.OnClickListener()
{ {
@Override @Override
@ -114,6 +116,7 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
} }
}); });
} }
}
@Override @Override
public void onStart() public void onStart()