From 9c5b23d15dddee8a1d502e3a41dddd7ebc61a620 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Wed, 18 Oct 2023 15:09:01 +0200
Subject: [PATCH] DataBeam 2.5j1 : - nella ricerca lavorazione da usare
 controllo di utensile attivo sostituito con controllo utensile presente nel
 setup corrente

---
 LuaLibs/BeamExec.lua     | 6 +++---
 LuaLibs/MachiningLib.lua | 2 +-
 Version.lua              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/LuaLibs/BeamExec.lua b/LuaLibs/BeamExec.lua
index efcf30e..1eb46cd 100644
--- a/LuaLibs/BeamExec.lua
+++ b/LuaLibs/BeamExec.lua
@@ -1544,7 +1544,7 @@ local function VerifyMortiseMirrored( Proc, vProc, b3Raw)
    end
    -- recupero eventuale utensile in doppio e suo diametro
    local sToolDoubleName = EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'DOUBLE', 's')
-   if not sToolDoubleName or not EgtTdbSetCurrTool( sToolDoubleName) or not EgtTdbGetCurrToolParam( MCH_TP.ACTIVE) then
+   if not sToolDoubleName or not EgtTdbSetCurrTool( sToolDoubleName) or not EgtFindToolInCurrSetup( sToolDoubleName) then
       return
    end
    local dToolDoubleDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM, 'd')
@@ -1613,7 +1613,7 @@ local function VerifyDtMortiseMirrored( Proc, vProc, b3Raw)
    end
    -- recupero eventuale utensile in doppio e suo diametro
    local sToolDoubleName = EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'DOUBLE', 's')
-   if not sToolDoubleName or not EgtTdbSetCurrTool( sToolDoubleName) or not EgtTdbGetCurrToolParam( MCH_TP.ACTIVE) then
+   if not sToolDoubleName or not EgtTdbSetCurrTool( sToolDoubleName) or not EgtFindToolInCurrSetup( sToolDoubleName) then
       return
    end
    local dToolDoubleDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM, 'd')
@@ -1694,7 +1694,7 @@ local function VerifyDrillMirrored( Proc, vProc, b3Raw)
    local dToolTipLength = EgtTdbGetCurrToolParam( MCH_TP.TOTLEN) - EgtTdbGetCurrToolParam( MCH_TP.LEN)
    -- recupero eventuale utensile in doppio, suo diametro e massima lavorazione
    local sToolDoubleName = EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'DOUBLE', 's')
-   if not sToolDoubleName or not EgtTdbSetCurrTool( sToolDoubleName) or not EgtTdbGetCurrToolParam( MCH_TP.ACTIVE) then
+   if not sToolDoubleName or not EgtTdbSetCurrTool( sToolDoubleName) or not EgtFindToolInCurrSetup( sToolDoubleName) then
       return
    end
    local dToolDoubleDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM, 'd')
diff --git a/LuaLibs/MachiningLib.lua b/LuaLibs/MachiningLib.lua
index 3fa8063..d3322d7 100644
--- a/LuaLibs/MachiningLib.lua
+++ b/LuaLibs/MachiningLib.lua
@@ -108,7 +108,7 @@ local function SetCurrMachiningAndTool( sMachName)
    local sTool = EgtTdbGetToolFromUUID( sTuuid)
    if not sTool then return false end
    if not EgtTdbSetCurrTool( sTool) then return false end
-   local bActive = EgtTdbGetCurrToolParam( MCH_TP.ACTIVE)
+   local bActive = EgtFindToolInCurrSetup( sTool)
    local sHead = EgtTdbGetCurrToolParam( MCH_TP.HEAD)
    local nHead = tonumber( sHead:sub( 2, #sHead))
    local bH2 = ( nHead >= 21 and nHead <= 29)
diff --git a/Version.lua b/Version.lua
index 38866fa..153486b 100644
--- a/Version.lua
+++ b/Version.lua
@@ -1,6 +1,6 @@
--- Version.lua by Egaltech s.r.l. 2023/09/26
+-- Version.lua by Egaltech s.r.l. 2023/10/18
 -- Gestione della versione di Beam
 
 NAME = 'Beam'
-VERSION = '2.5i2'
+VERSION = '2.5j1'
 MIN_EXE = '2.5c1'