ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9243 from JosJuice/android-input-overlay-null 

Android: Add null check for InputOverlay
This commit is contained in:
JosJuice 2020-11-11 11:22:41 +01:00 committed by GitHub
parent ae83685b0b 32ad2dcec3
commit 9e3e325add
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
View File

@ -94,14 +94,17 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
doneButton.setOnClickListener(v -> stopConfiguringControls()); doneButton.setOnClickListener(v -> stopConfiguringControls());
} }
contents.post(() -> if (mInputOverlay != null)
{ {
int overlayX = mInputOverlay.getLeft(); contents.post(() ->
int overlayY = mInputOverlay.getTop(); {
mInputOverlay.setSurfacePosition(new Rect( int overlayX = mInputOverlay.getLeft();
surfaceView.getLeft() - overlayX, surfaceView.getTop() - overlayY, int overlayY = mInputOverlay.getTop();
surfaceView.getRight() - overlayX, surfaceView.getBottom() - overlayY)); 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. // The new Surface created here will get passed to the native code via onSurfaceChanged.