Patch level : 2.0 588

Files correlati     : ve0.exe ve1.exe ve6.exe
Ricompilazione Demo : [ ]
Commento            :

GF20103
Sui documenti interattivi di vendita non legge il .ini nel direttorio CUSTOM


git-svn-id: svn://10.65.10.50/trunk@11459 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2003-10-02 11:14:32 +00:00
parent df77178ce1
commit 482b4c0dca
3 changed files with 25 additions and 17 deletions

View File

@ -777,8 +777,11 @@ TConfig::TConfig(int which_config, const char* paragraph)
}
TConfig::TConfig(const char *fn, const char* pa)
{ init(fn, pa, FALSE); }
{
TFilename f(fn);
f.custom_path();
init(f, pa, FALSE);
}
TConfig::~TConfig()
{

View File

@ -788,7 +788,8 @@ bool TMask::on_key(
case K_F1:
{
char key[_MAX_FNAME];
_splitpath(source_file(), NULL, NULL, key, NULL);
xvt_fsys_parse_pathname(source_file(), NULL, NULL, key, NULL, NULL);
EVENT e; memset(&e, 0, sizeof(e));
e.type = E_HELP;
e.v.help.tag = M_HELP_ONCONTEXT;

View File

@ -1291,20 +1291,24 @@ bool TFilename::input()
bool TFilename::custom_path(const char* path_list)
{
TToken_string pl = path_list;
if (pl.empty())
pl = "custom";
TFilename cust;
FOR_EACH_TOKEN(pl, path)
{
cust = path;
cust.add(name());
if (cust.exist())
{
set(cust);
return true;
}
}
const char* fname = name();
if (*this == fname) // Non c'e' path
{
TToken_string pl = path_list;
if (pl.empty())
pl = "custom";
FOR_EACH_TOKEN(pl, path)
{
TFilename cust = path;
cust.add(fname);
if (cust.exist())
{
set(cust);
return true;
}
}
}
return false;
}