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

Modifica della versione Linux sulla 2.1

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@12036 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2004-04-29 10:09:12 +00:00
parent 3d4b30e860
commit e0c0a37d01
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ba/ba1700.cpp
View File

@ -460,9 +460,11 @@ bool TInstaller_mask::autoload()
const int pos = ininame.find("a.ini"); const int pos = ininame.find("a.ini");
CHECKS(pos >= 6, TR("Invalid installation configuration: "), (const char*)ininame); CHECKS(pos >= 6, TR("Invalid installation configuration: "), (const char*)ininame);
const TString16 module = ininame.mid(pos-6, 2); const TString16 module = ininame.mid(pos-6, 2);
int r;
TConfig ini(ininame, module); TConfig ini(ininame, module);
ini.write_protect(); ini.write_protect();
for (int r = int(items()-1); r >=0; r--) for (r = int(items()-1); r >=0; r--)
if (module == row(r).get(C_CODE)) if (module == row(r).get(C_CODE))
break; break;
if (r >= 0) if (r >= 0)
@ -550,7 +552,7 @@ bool TInstaller_mask::can_install(const char* module, TInstall_ini& ini)
#endif #endif
TAuto_token_string altri(ini.get("Moduli", module)); TAuto_token_string altri(ini.get("Moduli", module));
if (stricmp(module, "ba") != 0 && altri.get_pos("ba") < 0) if (xvt_str_compare_ignoring_case(module, "ba") != 0 && altri.get_pos("ba") < 0)
altri.add("ba"); // La base e' obbligatoria per tutti altri.add("ba"); // La base e' obbligatoria per tutti
bool ok = TRUE; bool ok = TRUE;
@ -1235,7 +1237,7 @@ bool TInstaller_mask::quit_handler(TMask_field& f, KEY k)
{ {
if (k == K_SPACE) if (k == K_SPACE)
{ {
TInstaller_mask & m=(TInstaller_mask &) f.mask(); // TInstaller_mask & m=(TInstaller_mask &) f.mask(); inutile verificare
const bool check_on = _curr_mask->check_enabled(); const bool check_on = _curr_mask->check_enabled();
_curr_mask->enable_check(TRUE); _curr_mask->enable_check(TRUE);
const bool some = _curr_mask->one_checked(); const bool some = _curr_mask->one_checked();
@ -1440,17 +1442,8 @@ void TExtendedInstaller::main_loop()
conversion.run(); conversion.run();
} }
const bool reboot = _m->run_ba0close();
delete _m; _m = NULL; delete _m; _m = NULL;
/*
// TBI: Aggiungere test && non sono lanciato da BA0 (oppure sono lanciato da intall.exe)
if (reboot)
{
TExternal_app ba0close("ba0close.exe");
ba0close.run(TRUE,TRUE,TRUE); // run asynchronous...
}
*/
} }
int ba1700(int argc, char* argv[]) int ba1700(int argc, char* argv[])