diff --git a/designer/teditorform.tsf b/designer/teditorform.tsf index 29a9543..dda0a1e 100644 --- a/designer/teditorform.tsf +++ b/designer/teditorform.tsf @@ -41,7 +41,7 @@ type teditorform = class(TVCform) // const c_m_close_min = "关闭时最小化"; const c_m_lang = "语言"; const c_m_run = "运行"; - const c_m_editor = "编辑器"; + const c_m_editor = "默认"; const c_m_exer = "当前执行程序"; const c_m_help = "帮助"; const c_m_tsl_help = "tsl语言帮助"; diff --git a/designer/utslvcldebuger.tsf b/designer/utslvcldebuger.tsf index dfea96a..465c55c 100644 --- a/designer/utslvcldebuger.tsf +++ b/designer/utslvcldebuger.tsf @@ -1335,52 +1335,49 @@ type TTslDebuga=class(TCustomControl) end function getdebuger(pms); //获得调试程序 begin - p := static pluginpath(); - //FDebugExe := inireadstring("",p+"localediter.ini","debug","debuger",""); + p := static pluginpath(); global g_debug_chooser; if g_debug_chooser="当前执行程序" then begin - FDebugExe := "1"; + FDebugExe := "1"; end else begin - + FDebugExe := inireadstring("",p+"localediter.ini","debug","debuger",""); + if not ifstring(FDebugExe) then FDebugExe := ""; end - pms := " "; - //if FDebugExe="1" then //默认获取参数 - // begin - ps := owner.getexecuteparams(FRuningfile); - if ps then + pms := " "; + ps := owner.getexecuteparams(FRuningfile); + if ps then + begin + psi := ps[0]; + if fileexists("",psi)then begin - psi := ps[0]; - if fileexists("",psi)then - begin - cmdexe := psi; - end else - begin - if FDebugExe="1" then - ExecuteCommand("showstr","当前指定的执行程序不存在!!"); - end - psi := ps[1]; - if psi and fileexists("",psi)then - begin - end else - begin - pms += " "+tostn(psi); - end - idx := 2; - while idx"); - end + end end function remotedbugok(); begin diff --git a/funcext/tvclib/utssvr_api_c.tsf b/funcext/tvclib/utssvr_api_c.tsf index 886d2d0..4d15683 100644 --- a/funcext/tvclib/utssvr_api_c.tsf +++ b/funcext/tvclib/utssvr_api_c.tsf @@ -71,7 +71,11 @@ type t_func_finder_register = class(tsl_c_api_const) // end fhooks[length(fhooks)] := f; if not fhookptr then fhookptr := makeinstance(thisfunction(find_HOOK)); - if not fhookseted then TSL_InterpSetFindFunctionHook(fhookptr); + if not fhookseted then + begin + TSL_InterpSetFindFunctionHook(fhookptr); + fhookseted := true; + end end function del_hook(f); begin diff --git a/tsleditor.exe b/tsleditor.exe index 862807f..929eb4f 100644 Binary files a/tsleditor.exe and b/tsleditor.exe differ