diff --git a/setup/Setup.cpp b/setup/Setup.cpp index 1050878f5..01b606179 100755 --- a/setup/Setup.cpp +++ b/setup/Setup.cpp @@ -839,6 +839,7 @@ void CampoSetup::ClientUpdate() fn.MakeAbsolute(); fn.SetFullName("install.ini"); const wxString strLocalPath = fn.GetPath(); + wxString strRemotePath; { CampoIniFile iniLocalInstall(fn.GetFullPath(), "Main"); @@ -1424,14 +1425,18 @@ void CampoSetup::OnTimer(wxTimerEvent& WXUNUSED(e)) return; } - wxFileName strPath(argv[0]); - strPath.MakeAbsolute(); - strPath.SetCwd(); //path del programma setup.exe in esecuzione; serve in seguito in quanto alcuni metodi (tipo la GetAllFiles).. //..fanno perdere questo path - m_strSetupPath = strPath.GetPath(); //attenzione!!! il path DEVE terminare con "\" sennò in base al tipo di chiamata (-uw,-uc,-ud) i rispettivi.. //..metodi funzionano a casaccio!!! + m_strSetupPath = wxGetCwd(); + m_strSetupPath.MakeLower(); + if (!m_strSetupPath.EndsWith("setup")) + { + m_strSetupPath << "\\setup"; + wxSetWorkingDirectory(m_strSetupPath); + } + if (!m_strSetupPath.EndsWith(wxT("\\"))) m_strSetupPath << '\\'; diff --git a/setup/oem.ini b/setup/oem.ini index cc62bf643..bac6cc06c 100755 --- a/setup/oem.ini +++ b/setup/oem.ini @@ -11,7 +11,7 @@ Password = Product = ””’“žf·›·¦¿ÀÁ‰ØÓ Reseller = ’š†c¸´¸œ³´¢”ÒÑÇå›Ó¢Õ‘ Themes = aga_themes.ini -Web = www.aga.it/agarel100/ +Web = www.aga.it/release100/ [OEM_1] Administrator = ’—’Œ