summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java/org
diff options
context:
space:
mode:
authorsigmabeta <sigmabeta@users.noreply.github.com>2016-07-30 09:33:35 -0400
committersigmabeta <sigmabeta@users.noreply.github.com>2016-07-30 09:33:35 -0400
commit8724df3b708ff4e48d94d769af5bd8224e9b40ff (patch)
tree916ee0a818d77934ceccbc6a6ff3b26e577fdba3 /Source/Android/app/src/main/java/org
parentbe9416c462b1b5f0074d8a3a2b35171f2a154693 (diff)
Fix crash caused by trying to reference touch-screen config UI on devices without touchscreen
Diffstat (limited to 'Source/Android/app/src/main/java/org')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java15
1 files 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