From 1561b401cebf03a4559c41463c3e16ba8914fda4 Mon Sep 17 00:00:00 2001 From: mantaionut Date: Wed, 18 Dec 2024 14:39:19 +0200 Subject: [PATCH 1/2] Fix crash in OneNote Run --- src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs b/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs index 24666e3f51c4..61eed7a47419 100644 --- a/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs +++ b/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs @@ -238,7 +238,8 @@ public static List QueryForPlugin(PluginPair pair, Query query, bool del } catch (Exception e) { - Log.Exception($"Exception for plugin <{pair.Metadata.Name}> when query <{query}>", e, MethodBase.GetCurrentMethod().DeclaringType); + // MethodBase.GetCurrentMethod() crashes for OneNote + Log.Exception($"Exception for plugin <{pair.Metadata.Name}> when query <{query}>", e, typeof(PluginManager)); return new List(); } From 3ddabacec51e0fd9bb7acf9b50e676c36a5e9e1b Mon Sep 17 00:00:00 2001 From: mantaionut Date: Wed, 18 Dec 2024 14:48:02 +0200 Subject: [PATCH 2/2] added better comment --- src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs b/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs index 61eed7a47419..ad01b7eba4b9 100644 --- a/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs +++ b/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs @@ -238,7 +238,9 @@ public static List QueryForPlugin(PluginPair pair, Query query, bool del } catch (Exception e) { - // MethodBase.GetCurrentMethod() crashes for OneNote + // After updating to .NET 9, calling MethodBase.GetCurrentMethod() started crashing when trying + // to log methods called from within the OneNote plugin, so we've replaced this instance with typeof(PluginManager). + // This should be revised in the future. Log.Exception($"Exception for plugin <{pair.Metadata.Name}> when query <{query}>", e, typeof(PluginManager)); return new List();