Corretta selezione ditta nel menu scelta ditta

git-svn-id: svn://10.65.10.50/trunk@4906 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1997-07-25 07:19:13 +00:00
parent e5bae2b1af
commit cf3e0c9c26

View File

@ -542,21 +542,20 @@ bool TMenuitem::perform_submenu() const
TSubmenu* mnu = menu().find(_action); TSubmenu* mnu = menu().find(_action);
bool ok = mnu != NULL && mnu->enabled(); bool ok = mnu != NULL && mnu->enabled();
if (ok) if (ok)
{
if (mnu->items() == 1)
{ {
if (mnu->query_firm()) if (mnu->query_firm())
ok = main_app().set_firm(); ok = main_app().set_firm();
if (ok) if (ok)
{
if (mnu->items() == 1)
{ {
const TMenuitem& mi = mnu->item(0); const TMenuitem& mi = mnu->item(0);
ok = mi.enabled() && mi.perform(); ok = mi.enabled() && mi.perform();
} }
}
else else
menu().jumpto(mnu); menu().jumpto(mnu);
} }
}
return ok; return ok;
} }