Corretta richiesta ditta: se annulla non continua

git-svn-id: svn://10.65.10.50/trunk@467 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-10-26 14:52:42 +00:00
parent f923c45fe3
commit 417c689351
2 changed files with 60 additions and 1913 deletions

View File

@ -315,6 +315,7 @@ bool TMenu_application::create()
return TRUE;
}
bool TMenu_application::menu(MENU_TAG)
{
int refarray[256];
@ -330,31 +331,30 @@ bool TMenu_application::menu(MENU_TAG)
{
TToken_string& row = (TToken_string&)_menu[m];
const TFilename option(row.get(2));
if (option.not_empty())
{
bool ok = TRUE;
const int l = atoi(option);
if (l > 0)
{
const char* flags = row.get();
if (flags && strchr(flags, 'F') != NULL)
const TString16 flags(row.get());
if (flags.find('F') >= 0)
_ditta_asked = ok = set_firm();
if (ok)
{
set_firm();
_ditta_asked = TRUE;
refarray[i++] = _level;
if (l < _max) _level = l;
}
refarray[i++] = _level;
if (l < _max) _level = l;
}
else
{
{
TExternal_app a(option);
const TString& module = option.left(2);
if (module == "ba") _ditta_asked = FALSE; else
if (module == "cg" && !_ditta_asked)
{
set_firm();
_ditta_asked = TRUE;
}
a.run();
_ditta_asked = ok = set_firm();
if (ok) a.run();
}
}
}

File diff suppressed because it is too large Load Diff