From d426f08f4ac13c0d758270203817802e6bec5f2f Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 27 Oct 2009 10:50:29 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:10.0?=
 =?UTF-8?q?=20486=20Files=20correlati=20=20=20=20=20:=20Ricompilazione=20D?=
 =?UTF-8?q?emo=20:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20=20=20:?=
 =?UTF-8?q?=20=200001487:=20Installazione=20patch=20Descrizione=20=20i=20t?=
 =?UTF-8?q?ecnici=20presenti=20dal=20cliente=20(nella=20fattispecie=20Imba?=
 =?UTF-8?q?llaggi=20Effe=20Emme=20e=20Pharmatex)=20mi=20segnalano=20che=20?=
 =?UTF-8?q?installando=20le=20patch=20oltre=20la=20468=20dal=20lato=20clie?=
 =?UTF-8?q?nt=20viene=20segnalato=20errore=20sul=20modulo=20delle=20vendit?=
 =?UTF-8?q?e=20in=20quanto=20manca=20il=20file=20EFTBBNP.=20Poich=C3=A8=20?=
 =?UTF-8?q?da=20lato=20client=20non=20=C3=A8=20possibile=20modificare=20l'?=
 =?UTF-8?q?elenco=20dei=20moduli=20da=20caricare=20l'utente=20difficilment?=
 =?UTF-8?q?e=20riesce=20a=20bypassare=20questo=20errore.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.65.10.50/trunk@19516 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba1700.cpp | 17 +++++++++++------
 ba/ba8500.cpp |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

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)
         {