Merge pull request #4681 from drewnoakes/iteration

Replace tail call recursion with loop
gitextensions · Mar 28, 2018 · 86c0f3e · 86c0f3e
2 parents f9d0c04 + 205855c
commit 86c0f3e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/GitUI/GitUIExtensions.cs b/GitUI/GitUIExtensions.cs
@@ -251,16 +251,16 @@ public static void InvokeSync(this Control control, Action action)
 
         public static Control FindFocusedControl(this ContainerControl container)
         {
-            var control = container.ActiveControl;
-            container = control as ContainerControl;
-
-            if (container == null)
+            while (true)
             {
-                return control;
-            }
-            else
-            {
-                return container.FindFocusedControl();
+                if (container.ActiveControl is ContainerControl activeContainer)
+                {
+                    container = activeContainer;
+                }
+                else
+                {
+                    return container.ActiveControl;
+                }
             }
         }
     }

diff --git a/GitUI/Plugin/LoadPlugins.cs b/GitUI/Plugin/LoadPlugins.cs
@@ -51,16 +51,19 @@ public static void Load()
                         }
                         else
                         {
-                            void GetEx(Exception arg)
+                            // Walk inner exceptions
+                            Exception e = ex;
+                            while (true)
                             {
-                                exceptionInfo += arg.Message + "\r\n";
-                                if (arg.InnerException != null)
+                                exceptionInfo += e.Message + "\r\n";
+
+                                if (e.InnerException == null)
                                 {
-                                    GetEx(arg.InnerException);
+                                    break;
                                 }
-                            }
 
-                            GetEx(ex);
+                                e = e.InnerException;
+                            }
                         }
 
                         MessageBox.Show(string.Format("Failed to load plugin {0} : \r\n{1}", pluginFile, exceptionInfo));