From 497b573ec58a123354ac10437ea5ffdd834ffc74 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Sun, 17 Nov 2019 22:18:05 -0800
Subject: [PATCH] Bug fixes

---
 .../kanade/tachiyomi/source/model/SManga.kt   |  3 +++
 .../kanade/tachiyomi/ui/main/MainActivity.kt  | 21 +++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
index 8a1ba1af0c..6b2d95c26b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
@@ -23,6 +23,9 @@ interface SManga : Serializable {
     var initialized: Boolean
 
     fun copyFrom(other: SManga) {
+        if (other.title != title)
+            title = other.title
+
         if (other.author != null)
             author = other.author
 
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 075c47cb2d..52a34e758b 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
@@ -58,7 +58,7 @@ class MainActivity : BaseActivity() {
     private var secondaryDrawer: ViewGroup? = null
 
     private var snackBar:Snackbar? = null
-    var extraRectForUndo:Rect? = null
+    var extraViewForUndo:View? = null
     private var canDismissSnackBar = false
 
     fun setUndoSnackBar(snackBar: Snackbar?, extraViewToCheck: View? = null) {
@@ -68,12 +68,7 @@ class MainActivity : BaseActivity() {
             delay(1000)
             canDismissSnackBar = true
         }
-        if (extraViewToCheck != null) {
-            extraRectForUndo = Rect()
-            extraViewToCheck.getGlobalVisibleRect(extraRectForUndo)
-        }
-        else
-            extraRectForUndo = null
+        extraViewForUndo = extraViewToCheck
     }
 
     private val startScreenId by lazy {
@@ -340,18 +335,22 @@ class MainActivity : BaseActivity() {
                 val sRect = Rect()
                 snackBar!!.view.getGlobalVisibleRect(sRect)
 
+                val extRect:Rect? = if (extraViewForUndo != null) Rect() else null
+                extraViewForUndo?.getGlobalVisibleRect(extRect)
                 //This way the snackbar will only be dismissed if
                 //the user clicks outside it.
                 if (canDismissSnackBar && !sRect.contains(ev.x.toInt(), ev.y.toInt())
-                    && (extraRectForUndo == null ||
-                        !extraRectForUndo!!.contains(ev.x.toInt(), ev.y.toInt()))) {
+                    && (extRect == null ||
+                        !extRect.contains(ev.x.toInt(), ev.y.toInt()))) {
                     snackBar?.dismiss()
                     snackBar = null
-                    extraRectForUndo = null
+                    extraViewForUndo = null
                 }
             }
-            else if (snackBar != null)
+            else if (snackBar != null) {
                 snackBar = null
+                extraViewForUndo = null
+            }
         }
         return super.dispatchTouchEvent(ev)
     }