From fdd4b08a49859d74938d3392114f4c95c547e5c5 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Mon, 11 May 2020 12:55:53 -0400
Subject: [PATCH] Few more tracepot crashes

---
 .../eu/kanade/tachiyomi/data/database/models/LibraryManga.kt   | 2 --
 .../java/eu/kanade/tachiyomi/data/database/models/Manga.kt     | 2 ++
 .../java/eu/kanade/tachiyomi/ui/library/LibraryController.kt   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt
index 3df478f996..e428d175d4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt
@@ -6,8 +6,6 @@ class LibraryManga : MangaImpl() {
 
     var category: Int = 0
 
-    fun isBlank() = id == Long.MIN_VALUE
-
     companion object {
         fun createBlank(categoryId: Int): LibraryManga = LibraryManga().apply {
             title = ""
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
index 83761d2f1a..8881c3a46e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
@@ -27,6 +27,8 @@ interface Manga : SManga {
 
     var hide_title: Boolean
 
+    fun isBlank() = id == Long.MIN_VALUE
+
     fun setChapterOrder(order: Int) {
         setFlags(order, SORT_MASK)
         setFlags(SORT_LOCAL, SORT_SELF_MASK)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index 1d12313d0c..9028c5c0cf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -289,7 +289,7 @@ class LibraryController(
                 if (libraryLayout == 0) return 1
                 val item = this@LibraryController.adapter.getItem(position)
                 return if (item is LibraryHeaderItem || item is SearchGlobalItem || (item is LibraryItem && item.manga.isBlank())) {
-                    recycler.manager.spanCount
+                    recycler?.manager?.spanCount ?: 1
                 } else {
                     1
                 }
@@ -829,6 +829,7 @@ class LibraryController(
     }
 
     private fun setSelection(manga: Manga, selected: Boolean) {
+        if (manga.isBlank()) return
         val currentMode = adapter.mode
         if (selected) {
             if (selectedMangas.add(manga)) {