From 912d0bd800b74f09aad5e8d3ebd303fee064fe86 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <stanley.dimant@varian.com>
Date: Mon, 27 Feb 2023 10:40:06 +0100
Subject: [PATCH] move isbeingdrawn fully to framework and try catch

---
 MareSynchronos/Models/GameObjectHandler.cs | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/MareSynchronos/Models/GameObjectHandler.cs b/MareSynchronos/Models/GameObjectHandler.cs
index 2e803f5..a27d162 100644
--- a/MareSynchronos/Models/GameObjectHandler.cs
+++ b/MareSynchronos/Models/GameObjectHandler.cs
@@ -126,25 +126,25 @@ public class GameObjectHandler : MediatorSubscriberBase
 
     public async Task<bool> IsBeingDrawn()
     {
-        var curPtr = _getAddress.Invoke();
-        try
+        return await _dalamudUtil.RunOnFrameworkThread(() =>
         {
-            return await _dalamudUtil.RunOnFrameworkThread(() =>
+            var curPtr = _getAddress.Invoke();
+
+            try
             {
                 var drawObj = GetDrawObj();
                 return IsBeingDrawn(drawObj, curPtr);
-            }).ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error during checking for draw object for {name}", curPtr);
-            if (curPtr != IntPtr.Zero)
-            {
-                return true;
             }
-        }
+            catch (Exception ex)
+            {
+                if (curPtr != IntPtr.Zero)
+                {
+                    return true;
+                }
 
-        return false;
+                return false;
+            }
+        }).ConfigureAwait(false);
     }
 
     private unsafe void CheckAndUpdateObject()