From 750c515db8ed19b15e3d45f1f853e7504dc95607 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Sat, 8 Feb 2020 01:25:34 -0800
Subject: [PATCH] Fixing D&D sorting sometimes giving a blank library

---
 .../java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt     | 1 +
 app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index 8094a6ca8f..757485a9e0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -275,6 +275,7 @@ class LibraryPresenter(
                                 val index1 = order.indexOf(i1.manga.id!!)
                                 val index2 = order.indexOf(i2.manga.id!!)
                                 when {
+                                    index1 == index2 -> 0
                                     index1 == -1 -> -1
                                     index2 == -1 -> 1
                                     else -> index1.compareTo(index2)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 2d3e06e801..2340c6b2c2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -392,7 +392,7 @@ open class MainActivity : BaseActivity() {
             drawer.closeDrawers()
         } else if (backstackSize == 1 && router.getControllerWithTag("$startScreenId") == null) {
             setSelectedDrawerItem(startScreenId)
-        } else if (backstackSize == 1 || !router.handleBack()) {
+        } else if (!router.handleBack()) {
             unlocked = false
             super.onBackPressed()
         }