From dcccd160b7ca5f4b9051587b03bb764b238f50ba Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 23 Dec 2010 09:19:03 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2010.?=
 =?UTF-8?q?0=20Files=20correlati=20=20=20=20=20:=20setup.exe=20Ricompilazi?=
 =?UTF-8?q?one=20Demo=20:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20:=20Aggiunta=20richiesta=20di=20attesa=20per=20la=20chius?=
 =?UTF-8?q?ura=20di=20BA0.EXE=20in=20quanto=20client=20molto=20lenti=20imp?=
 =?UTF-8?q?iegano=20pi=C3=B9=20di=2010=20secondi=20a=20terminarlo=20non=20?=
 =?UTF-8?q?riuscendo=20quindi=20ad=20aggiornarsi=20dal=20server.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.65.10.50/branches/R_10_00@21357 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 setup/Setup.cpp | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/setup/Setup.cpp b/setup/Setup.cpp
index 7f4cfcf9c..624a6f535 100755
--- a/setup/Setup.cpp
+++ b/setup/Setup.cpp
@@ -1350,15 +1350,25 @@ bool CampoSetup::SystemRunning(const wxString& strAppName, wxString strMsg) cons
   wxSingleInstanceChecker sicProgram(strAppName);
 
   strMsg.Replace(wxT("PRODUCT"), PRODUCT);
+  strMsg += "\nSi desidera ritentare?";
 
-  int i;
-  for (i = 10; i > 0 && sicProgram.IsAnotherRunning(); i--)
-    wxSleep(1);
+  bool bRunning = false;
+  bool bRetry = true;
+  while (bRetry)
+  {
+    int i;
+    for (i = 10; i > 0 && sicProgram.IsAnotherRunning(); i--)
+      wxSleep(1);
 
-  if (i <= 0 && !strMsg.IsEmpty())
-    ErrorBox(strMsg);
+    bRetry = false;
+    bRunning = i <= 0;
+    if (bRunning && !strMsg.IsEmpty())
+    {
+      bRetry = YesNoBox(strMsg);
+    }
+  }
 
-  return i <= 0;
+  return bRunning;
 }
 
 
@@ -1426,7 +1436,7 @@ bool CampoSetup::CampoRunning() const
 
       if (sicProgram.IsAnotherRunning())
       {
-        strAppName << " è in esecuzione! E' necessario terminarlo utilizzando il Task Manager di Windows";
+        strAppName << " è in esecuzione! E' necessario terminarlo utilizzando il Task Manager di Windows.";
         ErrorBox(strAppName);
         return true;
       }