diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index f562e8a3c..15ea6a5b4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -540,8 +540,6 @@ class ReaderActivity : BaseRxActivity() presenter.setMangaOrientationType(newOrientation.flagValue) - updateOrientationShortcut(newOrientation.flagValue) - menuToggleToast?.cancel() menuToggleToast = toast(newOrientation.stringRes) } @@ -1351,6 +1349,7 @@ class ReaderActivity : BaseRxActivity() if (newOrientation.flag != requestedOrientation) { requestedOrientation = newOrientation.flag } + updateOrientationShortcut(presenter.getMangaOrientationType(resolveDefault = false)) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt index 5d5b58247..7e2cb638a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt @@ -639,10 +639,11 @@ class ReaderPresenter( /** * Returns the orientation type used by this manga or the default one. */ - fun getMangaOrientationType(): Int { + fun getMangaOrientationType(resolveDefault: Boolean = true): Int { val default = preferences.defaultOrientationType() - return when (manga?.orientationType) { - OrientationType.DEFAULT.flagValue -> default + val orientation = OrientationType.fromPreference(manga?.orientationType) + return when { + resolveDefault && orientation == OrientationType.DEFAULT -> default else -> manga?.orientationType ?: default } }