# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1628891447 0 # Node ID 3edc64443b7126dd72055337495812485d3144b9 # Parent 608598b9fed90ad9c09de95660b3aa01073c95cb Android: Fix a null pointer exception in the menu code running HandyFTP on Android. HandyFTP still failing after this fix, but it is due to missing resources in the project. Hopefully when I fix the resources it will start up. diff -r 608598b9fed9 -r 3edc64443b71 android/DWindows.kt --- a/android/DWindows.kt Fri Aug 13 21:12:25 2021 +0000 +++ b/android/DWindows.kt Fri Aug 13 21:50:47 2021 +0000 @@ -947,9 +947,11 @@ enabled = true } menuitem.enabled = enabled - runOnUiThread { - menuitem.menuitem!!.isEnabled = enabled - invalidateOptionsMenu() + if(menuitem.menuitem != null) { + runOnUiThread { + menuitem.menuitem!!.isEnabled = enabled + invalidateOptionsMenu() + } } } @@ -962,9 +964,11 @@ checked = true } menuitem.checked = checked - runOnUiThread { - menuitem.menuitem!!.isChecked = checked - invalidateOptionsMenu() + if(menuitem.menuitem != null) { + runOnUiThread { + menuitem.menuitem!!.isChecked = checked + invalidateOptionsMenu() + } } } }