Merge pull request #5189 from BrianNixon/manager_amwiz_crash

[Manager] Avoid crash if account manager list is empty
BOINC · Apr 10, 2023 · fe3ec78 · fe3ec78
2 parents 332f03f + da37950
commit fe3ec78
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/clientgui/AccountManagerInfoPage.cpp b/clientgui/AccountManagerInfoPage.cpp
@@ -339,16 +339,19 @@ void CAccountManagerInfoPage::OnPageChanging( wxWizardExEvent& event ) {
     if (event.GetDirection() == false) return;
 
     CWizardAttach* pWA = ((CWizardAttach*)GetParent());
-	CAcctMgrListItem* pItem = (CAcctMgrListItem*)(m_pProjectListCtrl->GetClientData(m_pProjectListCtrl->GetSelection()));
-
-    // Update authoritative data in CWizardAttach
-	if (m_pProjectUrlCtrl->GetValue() == pItem->GetURL()) {
-		pWA->SetProjectURL(pItem->GetURL());
-		pWA->SetProjectName(pItem->GetName());
-	} else {
-		pWA->SetProjectURL(m_pProjectUrlCtrl->GetValue());
-		pWA->SetProjectName(m_pProjectUrlCtrl->GetValue());
-	}
+    wxString url = m_pProjectUrlCtrl->GetValue();
+    wxString name = url;
+    int sel = m_pProjectListCtrl->GetSelection();
+    if (sel != wxNOT_FOUND) {
+        CAcctMgrListItem* pItem = (CAcctMgrListItem*)(m_pProjectListCtrl->GetClientData(sel));
+        // Update authoritative data in CWizardAttach
+        if (m_pProjectUrlCtrl->GetValue() == pItem->GetURL()) {
+            url = pItem->GetURL();
+            name = pItem->GetName();
+        }
+    }
+    pWA->SetProjectURL(url);
+    pWA->SetProjectName(name);
 }
 
 /*!