From 207397c325a85bd4067362e4b83c2e1c4c3a42da Mon Sep 17 00:00:00 2001
From: Gonk <chris@zink.tv>
Date: Sat, 29 Feb 2020 19:36:48 +0100
Subject: [PATCH] Canceling an existing and shown toast on P and up should
 prevent app crashes

---
 .../src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
index 69fcc57d1..eb55c9a9d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
@@ -6,6 +6,7 @@ import java.util.Collection;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -304,6 +305,9 @@ public final class MainActivity
 			t = Toast.makeText(this, msg, duration);
 			lastToast = new WeakReference<Toast>(t);
 		} else {
+			if (Build.VERSION.SDK_INT  >= Build.VERSION_CODES.P && t.getView().isShown()) {
+				t.cancel();
+			}
 			t.setText(msg);
 			t.setDuration(duration);
 		}