From d8ac35d25935080d086e7f0298a474c4dc2c87ec Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Mon, 4 Apr 2016 23:25:50 +0200
Subject: [PATCH] Crash fixes

---
 .../eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt  | 4 ++--
 .../kanade/tachiyomi/ui/library/LibraryCategoryFragment.kt | 7 +++----
 .../kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.kt  | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt
index f72b4675e7..c26f7afecf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt
@@ -427,9 +427,9 @@ class CatalogueFragment : BaseRxFragment<CataloguePresenter>(), FlexibleViewHold
      * @return true if the item should be selected, false otherwise.
      */
     override fun onListItemClick(position: Int): Boolean {
-        val selectedManga = adapter.getItem(position)
+        val item = adapter.getItem(position) ?: return false
 
-        val intent = MangaActivity.newIntent(activity, selectedManga)
+        val intent = MangaActivity.newIntent(activity, item)
         intent.putExtra(MangaActivity.FROM_CATALOGUE, true)
         startActivity(intent)
         return false
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryFragment.kt
index 2ed052b6cb..b0925ecae5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryFragment.kt
@@ -162,13 +162,12 @@ class LibraryCategoryFragment : BaseFragment(), FlexibleViewHolder.OnListItemCli
      */
     override fun onListItemClick(position: Int): Boolean {
         // If the action mode is created and the position is valid, toggle the selection.
-        if (position == -1) {
-            return false
-        } else if (libraryFragment.actionMode != null) {
+        val item = adapter.getItem(position) ?: return false
+        if (libraryFragment.actionMode != null) {
             toggleSelection(position)
             return true
         } else {
-            openManga(adapter.getItem(position))
+            openManga(item)
             return false
         }
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.kt
index cbedcfea26..572baa3775 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.kt
@@ -359,11 +359,12 @@ class ChaptersFragment : BaseRxFragment<ChaptersPresenter>(), ActionMode.Callbac
     }
 
     override fun onListItemClick(position: Int): Boolean {
+        val item = adapter.getItem(position) ?: return false
         if (actionMode != null && adapter.mode == FlexibleAdapter.MODE_MULTI) {
             toggleSelection(position)
             return true
         } else {
-            openChapter(adapter.getItem(position))
+            openChapter(item)
             return false
         }
     }