From 62f57b134a39fad5dc248bc16bcc186c380b8441 Mon Sep 17 00:00:00 2001
From: martinchrzan <martinchrzan@gmail.com>
Date: Mon, 3 Aug 2020 22:03:00 +0200
Subject: [PATCH] Fixing potentially infinite loop with logs in Color Picker
 (#5558)

---
 src/modules/colorPicker/ColorPickerUI/Helpers/Logger.cs     | 2 +-
 .../colorPicker/ColorPickerUI/Settings/UserSettings.cs      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/Logger.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/Logger.cs
index 17d7764e8e..7058a8ff51 100644
--- a/src/modules/colorPicker/ColorPickerUI/Helpers/Logger.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Helpers/Logger.cs
@@ -69,7 +69,7 @@ namespace ColorPicker.Helpers
 
             var methodName = stackTrace.GetFrame(3)?.GetMethod();
             var className = methodName?.DeclaringType.Name;
-            return "[Method]: " + methodName.Name + " [Class]: " + className;
+            return "[Method]: " + methodName?.Name + " [Class]: " + className;
         }
     }
 }
diff --git a/src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs b/src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs
index 7655eaef2f..72e68339a4 100644
--- a/src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs
@@ -83,7 +83,13 @@ namespace ColorPicker.Settings
                         }
                         catch (Exception ex)
                         {
+                            if (retryCount > MaxNumberOfRetry)
+                            {
+                                retry = false;
+                            }
+
                             Logger.LogError("Failed to read changed settings", ex);
+                            Thread.Sleep(500);
                         }
                     }
                 }