From bc7a2429c144ab627fcfaddde05f20d2be07589e Mon Sep 17 00:00:00 2001 From: yupeng_dyp Date: Thu, 10 Apr 2025 14:23:39 +0000 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=20jig=20=E5=B7=B2=E5=9C=A8=E5=A4=96?= =?UTF-8?q?=E9=9D=A2=E8=A2=AB=E9=87=8A=E6=94=BE=EF=BC=8C=E5=88=99=E5=86=85?= =?UTF-8?q?=E9=83=A8=E5=85=88=E5=88=A4=E6=96=AD=20ent.Database=20=E4=BC=9A?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=EF=BC=81=20=E5=B0=86=20jig?= =?UTF-8?q?=20=E9=87=8A=E6=94=BE=E6=97=B6=E7=9A=84=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=A1=BA=E5=BA=8F=E7=94=B1=20if=20(ent.Datab?= =?UTF-8?q?ase=20=3D=3D=20null=20&&=20!ent.IsDisposed=20)=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20if=20(!ent.IsDisposed=20&&=20ent.Database=20=3D=3D?= =?UTF-8?q?=20null)=EF=BC=8C=E9=81=BF=E5=85=8D=E5=9B=A0=E5=9C=A8=E5=A4=96?= =?UTF-8?q?=E9=9D=A2=E9=87=8A=E6=94=BE=E5=90=8E=E5=86=85=E9=83=A8=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=AF=BC=E8=87=B4=E9=94=99=E8=AF=AF=E8=80=8C=E9=80=80?= =?UTF-8?q?=E5=87=BACAD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yupeng_dyp --- src/CADShared/ExtensionMethod/Jig/JigEx.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CADShared/ExtensionMethod/Jig/JigEx.cs b/src/CADShared/ExtensionMethod/Jig/JigEx.cs index 7289922..84fe249 100644 --- a/src/CADShared/ExtensionMethod/Jig/JigEx.cs +++ b/src/CADShared/ExtensionMethod/Jig/JigEx.cs @@ -1,4 +1,4 @@ -#if a2024 || zcad +#if a2024 || zcad using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; // ReSharper disable ClassWithVirtualMembersNeverInherited.Global @@ -371,7 +371,7 @@ protected virtual void Dispose(bool disposing) // 最后一次的图元如果没有加入数据库,就在此销毁,所以JigEx调用的时候加using _drawEntities.ForEach(ent => { - if (ent.Database == null && !ent.IsDisposed) + if (!ent.IsDisposed && ent.Database == null) ent.Dispose(); }); } -- Gitee