From aedb4749a214e49695d4ef2fae1cb0674814339d Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Sat, 11 Apr 2020 00:06:25 -0400
Subject: [PATCH] Controllers now properly remove their toolbar items on pop
 (fixes #2864)

---
 .../eu/kanade/tachiyomi/ui/base/controller/BaseController.kt     | 1 +
 .../java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt    | 1 +
 2 files changed, 2 insertions(+)

diff --git 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
index 7b8a5bd02d..90d0664c28 100644
--- 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)
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
index 0e6a6e0628..d0697eb6db 100644
--- 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)
     }