Mercurial > dwindows
changeset 2642:3edc64443b71
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.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 13 Aug 2021 21:50:47 +0000 |
parents | 608598b9fed9 |
children | 28ca1e59e76f |
files | android/DWindows.kt |
diffstat | 1 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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() + } } } }