diff options
| author | JosJuice <josjuice@gmail.com> | 2020-11-11 10:38:49 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2020-11-11 10:38:49 +0100 |
| commit | 32ad2dcec3a561acd2f4afc9478b1e8fbd426f41 (patch) | |
| tree | 40959c38b385ecc0f1cab07f9d9a74ab3adc0509 /Source/Android/app/src/main/java | |
| parent | 72997c17d02b60386c564124f63d33cdf3743475 (diff) | |
Android: Add null check for InputOverlay
Hopefully fixes https://bugs.dolphin-emu.org/issues/12316.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java | 17 |
1 files changed, 10 insertions, 7 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 cfcd28ea02..61ff462536 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 @@ -94,14 +94,17 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C doneButton.setOnClickListener(v -> stopConfiguringControls()); } - contents.post(() -> + if (mInputOverlay != null) { - int overlayX = mInputOverlay.getLeft(); - int overlayY = mInputOverlay.getTop(); - mInputOverlay.setSurfacePosition(new Rect( - surfaceView.getLeft() - overlayX, surfaceView.getTop() - overlayY, - surfaceView.getRight() - overlayX, surfaceView.getBottom() - overlayY)); - }); + contents.post(() -> + { + int overlayX = mInputOverlay.getLeft(); + int overlayY = mInputOverlay.getTop(); + mInputOverlay.setSurfacePosition(new Rect( + surfaceView.getLeft() - overlayX, surfaceView.getTop() - overlayY, + surfaceView.getRight() - overlayX, surfaceView.getBottom() - overlayY)); + }); + } // The new Surface created here will get passed to the native code via onSurfaceChanged. |
