root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evitati errori in message copy su campi inesistenti

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22810 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2013-03-03 21:45:54 +00:00
parent b865dbd7a9
commit 66fce32cbf
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mask.cpp
View File

@ -238,7 +238,7 @@ void TMask::add_field(TMask_field* f)
const short id = f->dlg(); const short id = f->dlg();
if (id > 0 && id < 512) if (id > 0 && id < 512)
{ {
if (f->is_sheet()) if (f->is_sheet() && strncmp(_source_file.name(), "lv", 2) != 0)
{ {
for (short cid = 101; cid <= 110; cid++) for (short cid = 101; cid <= 110; cid++)
{ {

9
include/maskfld.cpp
View File

@ -1200,7 +1200,10 @@ bool TOperable_field::do_message(int num)
} }
else else
{ {
TMask_field& f = mask().field(fld); const int pos = mask().id2pos(fld);
if (pos >= 0)
{
TMask_field& f = mask().fld(pos);
const char* prev = f.get(); const char* prev = f.get();
if (value != prev) if (value != prev)
{ {
@ -1209,6 +1212,10 @@ bool TOperable_field::do_message(int num)
f.on_hit(); f.on_hit();
} }
} }
#ifdef DBG
// else error?
#endif
}
} }
} }

5
include/prefix.cpp
View File

@ -1418,8 +1418,7 @@ int TPrefix::firms(TArray& ditte)
TFilename ininame = firm2dir(codditta); TFilename ininame = firm2dir(codditta);
ininame.add("ditta.ini"); ininame.add("ditta.ini");
TConfig ini(ininame, "Main"); TConfig ini(ininame, "Main");
TAssoc_array& fields = ini.list_variables(); if (prefix_valid())
if (fields.empty() && prefix_valid())
{ {
TLocalisamfile nditte(LF_NDITTE); TLocalisamfile nditte(LF_NDITTE);
TRectype& ditta = nditte.curr(); TRectype& ditta = nditte.curr();
@ -1435,10 +1434,10 @@ int TPrefix::firms(TArray& ditte)
} }
} }
} }
TAssoc_array& fields = ini.list_variables();
if (fields.empty()) if (fields.empty())
{ {
ini.set(NDT_CODDITTA, codditta); ini.set(NDT_CODDITTA, codditta);
CHECK(!fields.empty(), "Can't genenerate firm data");
} }
ditte.add(fields); ditte.add(fields);
} }