Patch level :10.0 setup
Files correlati : Ricompilazione Demo : [ ] Commento :sistemati aggiornamenti da manutenzione git-svn-id: svn://10.65.10.50/trunk@15777 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
52e38fd05e
commit
e497ac0f18
@ -455,14 +455,9 @@ void CampoSetup::EmptyOutDir(const wxString& strDir) const
|
|||||||
{
|
{
|
||||||
wxArrayString asFilesList;
|
wxArrayString asFilesList;
|
||||||
const size_t uFilesToKill = wxDir::GetAllFiles(strDir, &asFilesList, "*.*");
|
const size_t uFilesToKill = wxDir::GetAllFiles(strDir, &asFilesList, "*.*");
|
||||||
if (uFilesToKill > 0)
|
|
||||||
{
|
|
||||||
for (size_t i = 0; i < uFilesToKill; i++)
|
for (size_t i = 0; i < uFilesToKill; i++)
|
||||||
{
|
|
||||||
::wxRemoveFile(asFilesList[i]);
|
::wxRemoveFile(asFilesList[i]);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------
|
//-----------------------------------------------------
|
||||||
@ -659,7 +654,7 @@ bool CampoSetup::InternetUpdateModule(const wxString& strLocalPath, const wxStri
|
|||||||
wxString strHref = strWrk.Mid(nPos + 5, 16);
|
wxString strHref = strWrk.Mid(nPos + 5, 16);
|
||||||
strHref = strHref.AfterFirst('"');
|
strHref = strHref.AfterFirst('"');
|
||||||
strHref = strHref.BeforeLast('"');
|
strHref = strHref.BeforeLast('"');
|
||||||
if ( strHref.StartsWith(strModule) && atoi(strHref.Mid(2)) > nLocPatch )
|
if ( strHref.StartsWith(strModule) && ((atoi(strHref.Mid(2)) > nLocPatch) || (nLocPatch == 0)))
|
||||||
{
|
{
|
||||||
if (!pi.Update((int)tfFilesList.GetCurrentLine(), strHref))
|
if (!pi.Update((int)tfFilesList.GetCurrentLine(), strHref))
|
||||||
break;
|
break;
|
||||||
@ -1140,7 +1135,6 @@ void CampoSetup::OnTimer(wxTimerEvent& WXUNUSED(e))
|
|||||||
NormalSetup();
|
NormalSetup();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wxSleep(2);
|
|
||||||
if (strCommand == "-ud")
|
if (strCommand == "-ud")
|
||||||
DiskUpdate();
|
DiskUpdate();
|
||||||
if (strCommand == "-uc")
|
if (strCommand == "-uc")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user