From dac1a87ff76764bf604f320ceb4a7d015c8ecd39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D0=BD=D0=B4=D0=B0=D1=80=D0=B5=D0=B2=20=D0=98?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD?= Date: Sun, 12 Jan 2020 14:25:53 +0100 Subject: [PATCH] bug fix #2170 --- TreeConverter/NetWrappers/NetHelper.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TreeConverter/NetWrappers/NetHelper.cs b/TreeConverter/NetWrappers/NetHelper.cs index b833686e9..f4a37371e 100644 --- a/TreeConverter/NetWrappers/NetHelper.cs +++ b/TreeConverter/NetWrappers/NetHelper.cs @@ -932,10 +932,13 @@ namespace PascalABCCompiler.NetHelper { try { + if (curr_inited_assm_path != null) { Assembly assm = null; string path = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(curr_inited_assm_path), args.Name.Substring(0, args.Name.IndexOf(",")) + ".dll"); + if (!System.IO.File.Exists(path)) + path = System.IO.Path.Combine(System.IO.Directory.GetCurrentDirectory(), args.Name.Substring(0, args.Name.IndexOf(",")) + ".dll"); if (System.IO.File.Exists(path)) assm = LoadAssembly(path); curr_inited_assm_path = null;