From aa426268eeea237699e3ed6d6cb97cb4f7cd8d1d Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:11:42 +0700
Subject: [PATCH] Custom controls: add a null check to fixing crash

---
 .../main/java/net/kdt/pojavlaunch/CustomControlsActivity.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
index 6ee6ca736..3097f06db 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
@@ -34,7 +34,7 @@ public class CustomControlsActivity extends BaseActivity
 	protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        if (getIntent().getExtras().getBoolean("fromMainActivity", false)) {
+        if (getIntent().getExtras() != null && getIntent().getExtras().getBoolean("fromMainActivity", false)) {
             // TODO translucent!
             // setTheme(androidx.appcompat.R.style.Theme_AppCompat_Translucent);
         }