MGR: Fix a problem where OS X's software firewall can cause RPC authorization to fail.

This commit is contained in:
Charlie Fenton 2014-10-02 03:04:39 -07:00
parent 41068fb802
commit 836e491d96
1 changed files with 6 additions and 4 deletions

View File

@ -509,10 +509,12 @@ wxMenu *CTaskBarIcon::BuildContextMenu() {
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
// Prevent recursive entry of CMainDocument::RequestRPC()
if (!pDoc->WaitingForRPC()) {
// Account managers have a different menu arrangement
pDoc->rpc.acct_mgr_info(ami);
is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
if (!pDoc->WaitingForRPC()) {
if (pDoc->IsConnected()) {
// Account managers have a different menu arrangement
pDoc->rpc.acct_mgr_info(ami);
is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
}
}
if (is_acct_mgr_detected) {