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,14 +105,17 @@ 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);
doneButton.setOnClickListener(new View.OnClickListener() if (doneButton != null)
{ {
@Override doneButton.setOnClickListener(new View.OnClickListener()
public void onClick(View v)
{ {
stopConfiguringControls(); @Override
} public void onClick(View v)
}); {
stopConfiguringControls();
}
});
}
} }
@Override @Override