Correctly check app state in delayed callbacks

nkming2 · Feb 24, 2017 · 9cbb9f9 · 9cbb9f9
1 parent 4470426
commit 9cbb9f9
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/kotlin/com/nkming/powermenu/MainFragment.kt b/src/main/kotlin/com/nkming/powermenu/MainFragment.kt
@@ -221,6 +221,7 @@ class MainFragment : Fragment()
 		_restartBtn.bound.setOnClickListener(null)
 		_showRestartMenu(Res.ANIMATION_FAST / 2,
 		{
+			activity ?: return@_showRestartMenu
 			_initRestartBtns()
 		})
 	}
@@ -231,11 +232,7 @@ class MainFragment : Fragment()
 				.toLong()
 		_startReveal(_screenshotBtn.btn, R.color.screenshot_bg, true,
 		{
-			// App probably closed
-			if (activity == null)
-			{
-				return@_startReveal
-			}
+			activity ?: return@_startReveal
 			activity.finish()
 
 			val receiver = object: BroadcastReceiver()