From a1e1b7d10393dc23fa306ef03e392aa03e0b9ee1 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:03:12 -0400
Subject: fix map tile rotation broken when you return to title

---
 docs/release-notes.md        |  1 +
 src/SMAPI/Framework/SCore.cs | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 554b9518..6e531dbd 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -12,6 +12,7 @@
   * Added heuristic compatibility rewrites, which fix some mods previously incompatible with Android or newer game versions.
   * Tweaked the rules for showing update alerts (see _for SMAPI developers_ below for details).
   * Fixed crossplatform compatibility for mods which use the `[HarmonyPatch(type)]` attribute (thanks to spacechase0!).
+  * Fixed map tile rotation broken when you return to the title screen and reload a save.
   * Fixed broken URL in update alerts for unofficial versions.
   * Fixed rare error when a mod adds/removes event handlers asynchronously.
   * Fixed rare issue where the console showed incorrect colors when mods wrote to it asynchronously.
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 99a809ad..06d9eac1 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -142,6 +142,9 @@ namespace StardewModdingAPI.Framework
         /// <summary>Whether the game is creating the save file and SMAPI has already raised <see cref="IGameLoopEvents.SaveCreating"/>.</summary>
         private bool IsBetweenCreateEvents;
 
+        /// <summary>Whether the player just returned to the title screen.</summary>
+        private bool JustReturnedToTitle;
+
         /// <summary>Asset interceptors added or removed since the last tick.</summary>
         private readonly List<AssetInterceptorChange> ReloadAssetInterceptorsQueue = new List<AssetInterceptorChange>();
 
@@ -456,9 +459,17 @@ namespace StardewModdingAPI.Framework
 
             try
             {
+                /*********
+                ** Safe queued work
+                *********/
+                // print warnings/alerts
                 SCore.DeprecationManager.PrintQueued();
                 SCore.PerformanceMonitor.PrintQueuedAlerts();
 
+                // reapply overrides
+                if (this.JustReturnedToTitle && !(Game1.mapDisplayDevice is SDisplayDevice))
+                    Game1.mapDisplayDevice = new SDisplayDevice(Game1.content, Game1.game1.GraphicsDevice);
+
                 /*********
                 ** First-tick initialization
                 *********/
@@ -1039,8 +1050,7 @@ namespace StardewModdingAPI.Framework
         {
             // perform cleanup
             this.Multiplayer.CleanupOnMultiplayerExit();
-            if (!(Game1.mapDisplayDevice is SDisplayDevice))
-                Game1.mapDisplayDevice = new SDisplayDevice(Game1.content, Game1.game1.GraphicsDevice);
+            this.JustReturnedToTitle = true;
         }
 
         /// <summary>Raised before the game exits.</summary>
-- 
cgit