Controllers now properly remove their toolbar items on pop (fixes #2864)

2020-04-11 00:06:25 -04:00 · 2020-04-11 00:06:25 -04:00 · aedb4749a2
commit aedb4749a2
parent f52d49ad00
2 changed files with 2 additions and 0 deletions
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
@ -61,6 +61,7 @@ abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateContr
        if (type.isEnter) {
            setTitle()
        }
+        setHasOptionsMenu(type.isEnter)
        super.onChangeStarted(handler, type)
    }

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
@ -74,6 +74,7 @@ abstract class SettingsController : PreferenceController() {
        if (type.isEnter) {
            setTitle()
        }
+        setHasOptionsMenu(type.isEnter)
        super.onChangeStarted(handler, type)
    }