Merge pull request #414 from kekekeks/fixes/no-com-support

Add support for runtimes without built-in COM interop
icsharpcode · Oct 28, 2023 · 5928324 · 5928324
2 parents fedfb2f + 6665a3a
commit 5928324
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/ICSharpCode.AvalonEdit/Editing/ImeNativeWrapper.cs b/ICSharpCode.AvalonEdit/Editing/ImeNativeWrapper.cs
@@ -116,7 +116,14 @@ public static ITfThreadMgr GetTextFrameworkThreadManager()
 		{
 			if (!textFrameworkThreadMgrInitialized) {
 				textFrameworkThreadMgrInitialized = true;
-				TF_CreateThreadMgr(out textFrameworkThreadMgr);
+				try
+				{
+					TF_CreateThreadMgr(out textFrameworkThreadMgr);
+				}
+				catch
+				{
+					// The call will fail if the current runtime doesn't have COM interop
+				}
 			}
 			return textFrameworkThreadMgr;
 		}