From fe49286d97ab93345f8dd03b5dc1eb7ff2869fa1 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Thu, 7 Apr 2016 20:39:37 +0200
Subject: [PATCH] A few more crashes fixed

---
 .../tachiyomi/ui/reader/ReaderActivity.kt     | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

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 99cf44533d..5285c1164e 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
@@ -143,6 +143,8 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
     }
 
     override fun onBackPressed() {
+        if (isFinishing) return
+
         presenter.onChapterLeft()
 
         val chapterToUpdate = presenter.getMangaSyncChapterToUpdate()
@@ -173,26 +175,28 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
     }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        val action = event.action
-        val keyCode = event.keyCode
-        when (keyCode) {
-            KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                if (action == KeyEvent.ACTION_UP)
-                    viewer?.moveToNext()
-                return true
+        if (!isFinishing) {
+            val action = event.action
+            val keyCode = event.keyCode
+            when (keyCode) {
+                KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT -> {
+                    if (action == KeyEvent.ACTION_UP)
+                        viewer?.moveToNext()
+                    return true
+                }
+                KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_DPAD_LEFT -> {
+                    if (action == KeyEvent.ACTION_UP)
+                        viewer?.moveToPrevious()
+                    return true
+                }
             }
-            KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_DPAD_LEFT -> {
-                if (action == KeyEvent.ACTION_UP)
-                    viewer?.moveToPrevious()
-                return true
-            }
-            else -> return super.dispatchKeyEvent(event)
         }
+        return super.dispatchKeyEvent(event)
     }
 
     fun onChapterError(error: Throwable) {
-        finish()
         Timber.e(error, error.message)
+        finish()
         toast(R.string.page_list_error)
     }