From 8724df3b708ff4e48d94d769af5bd8224e9b40ff Mon Sep 17 00:00:00 2001 From: sigmabeta Date: Sat, 30 Jul 2016 09:33:35 -0400 Subject: [PATCH] Fix crash caused by trying to reference touch-screen config UI on devices without touchscreen --- .../dolphinemu/fragments/EmulationFragment.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java index 3202f488d3..56a8b60c46 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java @@ -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