From 7930d532d52a0158c5e315942c2cfce60cc4026c Mon Sep 17 00:00:00 2001
From: Maurício Gomes <mauricio.gomes@coderofworlds.com>
Date: Thu, 31 Mar 2016 20:18:18 -0300
Subject: fixed conflict

---
 StardewModdingAPI/Inheritance/SGame.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'StardewModdingAPI')

diff --git a/StardewModdingAPI/Inheritance/SGame.cs b/StardewModdingAPI/Inheritance/SGame.cs
index ccd3846c..5cdc92c6 100644
--- a/StardewModdingAPI/Inheritance/SGame.cs
+++ b/StardewModdingAPI/Inheritance/SGame.cs
@@ -1312,10 +1312,7 @@ namespace StardewModdingAPI.Inheritance
 
                     GraphicsEvents.InvokeOnPostRenderEvent(null, EventArgs.Empty);
                     spriteBatch.End();
-
-                    GraphicsEvents.InvokeDrawTick();
-                    GraphicsEvents.InvokeDrawInRenderTargetTick();
-
+                    
                     if (!ZoomLevelIsOne)
                     {
                         GraphicsDevice.SetRenderTarget(null);
@@ -1324,6 +1321,9 @@ namespace StardewModdingAPI.Inheritance
                         spriteBatch.Draw(Screen, Vector2.Zero, Screen.Bounds, Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);
                         spriteBatch.End();
                     }
+
+                    GraphicsEvents.InvokeDrawTick();
+                    GraphicsEvents.InvokeDrawInRenderTargetTick();
                 }
                 catch (Exception ex)
                 {
-- 
cgit