From 4c5c5f5f850d61eb0b97202886e944c34d4bb344 Mon Sep 17 00:00:00 2001 From: fdbozzo Date: Sat, 25 Mar 2017 14:03:59 +0100 Subject: [PATCH] =?UTF-8?q?Incompleto=20-=20por=20alg=C3=BAn=20motivo=20no?= =?UTF-8?q?=20lo=20termina=20de=20poder=20usar=20el=20nuevo=20CFG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foxbin2prg.prg | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/foxbin2prg.prg b/foxbin2prg.prg index e2d2b1f..fa833eb 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -1854,9 +1854,19 @@ DEFINE CLASS c_foxbin2prg AS Session IF .l_Main_CFG_Loaded AND NOT EMPTY(tc_InputFile) AND NOT tcInputFile_Type == C_FILETYPE_QUERYSUPPORT THEN IF tcInputFile_Type == C_FILETYPE_DIRECTORY THEN - lcConfigFile = FULLPATH( 'foxbin2prg.cfg', ADDBS(tc_InputFile) ) + IF NOT EMPTY(lcConfigFile) AND NOT EMPTY(JUSTPATH(lcConfigFile)) ; + AND ADDBS(JUSTPATH(lcConfigFile)) == ADDBS(tc_InputFile) + * Preservar el config indicado manualmente + ELSE + lcConfigFile = FULLPATH( 'foxbin2prg.cfg', ADDBS(tc_InputFile) ) + ENDIF ELSE - lcConfigFile = FULLPATH( 'foxbin2prg.cfg', tc_InputFile ) + IF NOT EMPTY(lcConfigFile) AND NOT EMPTY(JUSTPATH(lcConfigFile)) ; + AND ADDBS(JUSTPATH(lcConfigFile)) == ADDBS(JUSTPATH(tc_InputFile)) + * Preservar el config indicado manualmente + ELSE + lcConfigFile = FULLPATH( 'foxbin2prg.cfg', tc_InputFile ) + ENDIF ENDIF ENDIF