diff --git a/ba/ba1700.cpp b/ba/ba1700.cpp index bc0c4a8e5..486a2885b 100755 --- a/ba/ba1700.cpp +++ b/ba/ba1700.cpp @@ -1255,18 +1255,23 @@ bool TInstaller_mask::install(const TString& module, int patchlevel) src = path; src.add(dst); const int reboot = needs_reboot(dst); - if ((reboot & NEW_SYS)!=0 && dst.exist()) + if ((reboot & NEW_SYS) != 0 && dst.exist()) { dst.rtrim(1); dst << '_'; } + //copia il file dalla dir sorgenti ok = copy_file(src, dst); - - if (ok && is_zip_file(src)) - aga_unzip(src, dst.path()); + if (ok) + { + if (ok && is_zip_file(src)) + aga_unzip(src, dst.path()); - if (ok && reboot != NONE) - _reboot_program |= reboot; + if (ok && reboot != NONE) + _reboot_program |= reboot; + } + else //se non riesce chiede se proseguire ugualmente + ok = yesno_box(TR("Continuare ugualmente ?")); cancelled = pi.iscancelled(); } diff --git a/ba/ba8500.cpp b/ba/ba8500.cpp index 9e8e304fc..53dc0b206 100755 --- a/ba/ba8500.cpp +++ b/ba/ba8500.cpp @@ -221,8 +221,8 @@ void TKlarkKent_app::main_loop() const bool custom_app = rep2app(report_name, appname, desc); const TString& cust_cmd = cmd2name(appname); const TString& this_cmd = cmd2name(argv(0), argv(1)); - if (custom_app && (cust_cmd != this_cmd)) - { + if (custom_app && (cust_cmd != this_cmd)) //il contenuto dell && serve ad evitare spiacevoli infinite esecuzioni.. + { //..e conseguenti forzati spegnimenti del computer appname << ' ' << report_name; if (vars.items() > 0) {