Fix bug in WCG version of client when using the project_init.xml

file it initiate auto-attach to World Community Grid.
This commit is contained in:
Kevin Reed 2013-04-09 13:03:05 -05:00
parent f10fb75220
commit c7de1efaf5
2 changed files with 5 additions and 7 deletions

View File

@ -249,6 +249,7 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
bool is_acct_mgr_detected = false;
bool is_wcg_client = false;
wxString strBuffer = wxEmptyString;
CWizardAttach* pWAP = ((CWizardAttach*)GetParent());
wxASSERT(pDoc);
@ -267,6 +268,8 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
std::string wcgUrl = "http://www.worldcommunitygrid.org/";
if ( pDoc->state.lookup_project(wcgUrl.c_str()) ) {
is_wcg_client = true;
pWAP->IsAttachToProjectWizard = false;
pWAP->IsChangeWCGApps = true;
}
#endif

View File

@ -119,14 +119,9 @@ bool CWizardAttach::Create( wxWindow* parent, wxWindowID id, const wxString& /*
// Wizard Detection
#if defined (_WCG)
IsAttachToProjectWizard = false;
IsChangeWCGApps = true;
#else
IsAttachToProjectWizard = true;
IsChangeWCGApps = false;
IsFirstPass = false;
#endif
IsChangeWCGApps = false;
IsFirstPass = false;
IsAccountManagerWizard = false;
IsAccountManagerUpdateWizard = false;