From b0d7491f7613166e9ec58d7ee6bf2b639bd48967 Mon Sep 17 00:00:00 2001 From: davidpanderson Date: Sat, 11 Jul 2020 01:18:36 -0700 Subject: [PATCH] Client: if AM reply includes a project we're attached to under a different account, honor the params in the AM reply, e.g resource share. Also: fix WxWidgets runtime warnings about spacers. --- client/acct_mgr.cpp | 3 +-- clientgui/DlgItemProperties.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client/acct_mgr.cpp b/client/acct_mgr.cpp index 50ba9cbe09..3be40b5008 100644 --- a/client/acct_mgr.cpp +++ b/client/acct_mgr.cpp @@ -672,12 +672,11 @@ void ACCT_MGR_OP::handle_reply(int http_op_retval) { "Received new authenticator from account manager" ); } else { - // otherwise skip this update + // otherwise keep using the old one // msg_printf(pp, MSG_INFO, "Already attached to a different account" ); - continue; } } } diff --git a/clientgui/DlgItemProperties.cpp b/clientgui/DlgItemProperties.cpp index 0f19a0913d..fa59730daf 100644 --- a/clientgui/DlgItemProperties.cpp +++ b/clientgui/DlgItemProperties.cpp @@ -69,18 +69,18 @@ CDlgItemProperties::CDlgItemProperties(wxWindow* parent) : m_bSizer1->Add( m_txtInformation, 1, wxEXPAND | wxALL, 5 ); wxBoxSizer *bSizer2 = new wxBoxSizer(wxHORIZONTAL); - m_bSizer1->Add(bSizer2, 0, wxALIGN_BOTTOM | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 12); + m_bSizer1->Add(bSizer2, 0, wxALIGN_RIGHT | wxALL, 12); m_pCopyAllButton = new wxButton(this, ID_COPYALL, _("Copy &All"), wxDefaultPosition, wxDefaultSize); - bSizer2->Add(m_pCopyAllButton, 0, wxALIGN_BOTTOM | wxALIGN_CENTER_HORIZONTAL | wxALL, 5); + bSizer2->Add(m_pCopyAllButton, 0, wxALIGN_BOTTOM | wxALL, 5); m_pCopySelectedButton = new wxButton(this, ID_COPYSELECTED, _("Copy &Selected"), wxDefaultPosition, wxDefaultSize); - bSizer2->Add(m_pCopySelectedButton, 0, wxALIGN_BOTTOM | wxALIGN_CENTER_HORIZONTAL | wxALL, 5); + bSizer2->Add(m_pCopySelectedButton, 0, wxALIGN_BOTTOM | wxALL, 5); m_pCopySelectedButton->Enable(false); m_btnClose = new wxButton( this, wxID_OK, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_btnClose->SetDefault(); - bSizer2->Add( m_btnClose, 0, wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); + bSizer2->Add( m_btnClose, 0, wxALIGN_BOTTOM|wxALL, 5 ); SetSizer( m_bSizer1 ); Layout();