From e0c0a37d017781e99370bad921440f82ba02c1c7 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 29 Apr 2004 10:09:12 +0000 Subject: [PATCH] Modifica della versione Linux sulla 2.1 git-svn-id: svn://10.65.10.50/trunk@12036 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba1700.cpp | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/ba/ba1700.cpp b/ba/ba1700.cpp index 58da9f2f3..ae40f86a2 100755 --- a/ba/ba1700.cpp +++ b/ba/ba1700.cpp @@ -129,7 +129,7 @@ public: bool installed() { return _installed;} bool autoload(); bool install(const TString& module, int patch); - bool run_ba0close() const { return _reboot_program >= NEW_MENUPRG; } + bool run_ba0close() const { return _reboot_program >= NEW_MENUPRG; } TInstaller_mask(); virtual ~TInstaller_mask(); @@ -460,9 +460,11 @@ bool TInstaller_mask::autoload() const int pos = ininame.find("a.ini"); CHECKS(pos >= 6, TR("Invalid installation configuration: "), (const char*)ininame); const TString16 module = ininame.mid(pos-6, 2); - TConfig ini(ininame, module); + int r; + TConfig ini(ininame, module); + 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)) break; if (r >= 0) @@ -550,7 +552,7 @@ bool TInstaller_mask::can_install(const char* module, TInstall_ini& ini) #endif 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 bool ok = TRUE; @@ -1235,7 +1237,7 @@ bool TInstaller_mask::quit_handler(TMask_field& f, KEY k) { 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(); _curr_mask->enable_check(TRUE); const bool some = _curr_mask->one_checked(); @@ -1440,17 +1442,8 @@ void TExtendedInstaller::main_loop() conversion.run(); } - const bool reboot = _m->run_ba0close(); 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[]) @@ -1468,4 +1461,4 @@ int ba1700(int argc, char* argv[]) app.run(argc, argv, PROGNAME); } return 0; -} \ No newline at end of file +}