root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/trunk@15624 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-09-17 15:47:11 +00:00
parent 96f33c01ee
commit 0f454ec939
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup/Setup.cpp
View File

@ -2204,8 +2204,10 @@ void CampoSetup::OnTimer(wxTimerEvent& WXUNUSED(e))
//tipo di installazione/aggiornamento //tipo di installazione/aggiornamento
const unsigned int uInstallationType = m_pWizard->GetInstallationType(); const unsigned int uInstallationType = m_pWizard->GetInstallationType();
const bool bNewInstallation = uInstallationType < 3; const bool bNewInstallation = uInstallationType < 3;
//installazione servers? //installazione servers? solo per server di campo
const bool bInstallLurch = uInstallationType == 1 && (m_pWizard->GetInstUseAuth() || m_pWizard->GetInstUseDict()); const bool bInstallLurch = uInstallationType == 1 && (m_pWizard->GetInstUseAuth() || m_pWizard->GetInstUseDict());
//uso servers? sarebbe solo per i client ma lo teniamo buono per tutti
const bool bUseLurch = uInstallationType != 1 && (!m_pWizard->GetSrvAuth().IsEmpty() || !m_pWizard->GetSrvDict().IsEmpty());
//installazione datidemo? (oddio speriamo di no!; comunque vale solo per installazione standard) //installazione datidemo? (oddio speriamo di no!; comunque vale solo per installazione standard)
const bool bInstallDemoData = uInstallationType == 0 && m_pWizard->GetInstDemoData(); const bool bInstallDemoData = uInstallationType == 0 && m_pWizard->GetInstDemoData();
//cartelle selezionate dall'utente //cartelle selezionate dall'utente
@ -2382,13 +2384,11 @@ void CampoSetup::OnTimer(wxTimerEvent& WXUNUSED(e))
} }
} }
//paragrafo [Server] //paragrafo [Server]
if (bInstallLurch) if (bInstallLurch || bUseLurch)
{ {
CampoIniFile CampoIniSrv(strPrgLocPath + "/campo.ini", "Server"); CampoIniFile CampoIniSrv(strPrgLocPath + "/campo.ini", "Server");
if (m_pWizard->GetInstUseAuth()) CampoIniSrv.Set("Dongle", m_pWizard->GetSrvAuth());
CampoIniSrv.Set("Authoriz", m_pWizard->GetSrvAuth()); CampoIniSrv.Set("Dictionary", m_pWizard->GetSrvDict());
if (m_pWizard->GetInstUseDict())
CampoIniSrv.Set("Dictionary", m_pWizard->GetSrvDict());
} }
} //if(bNewInstallation... } //if(bNewInstallation...