mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-28 17:09:34 -05:00
fixed bug in distant msg composer checking
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7929 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
b731999f99
commit
140ef988a5
@ -1367,6 +1367,11 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
|
||||
if(ui.signMessage_CB->isChecked())
|
||||
mi.msgflags |= RS_MSG_SIGNED ;
|
||||
|
||||
if(mi.rsgxsid_srcId.isNull() && !(mi.rsgxsid_msgto.empty() && mi.rsgxsid_msgcc.empty() && mi.rsgxsid_msgbcc.empty()))
|
||||
{
|
||||
QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers fro the destination list."), QMessageBox::Ok);
|
||||
return false; // Don't send if cannot sign.
|
||||
}
|
||||
if (rsMsgs->MessageSend(mi) == false) {
|
||||
return false;
|
||||
}
|
||||
@ -2408,7 +2413,7 @@ void MessageComposer::addContact(enumType type)
|
||||
std::list<RsGxsId> gxsIds ;
|
||||
ui.friendSelectionWidget->selectedIds<RsGxsId,FriendSelectionWidget::IDTYPE_GXS>(gxsIds, false);
|
||||
|
||||
if(!gxsIds.empty() && ui.respond_to_CB->hasAvailableIds())
|
||||
if(!gxsIds.empty() && !ui.respond_to_CB->hasAvailableIds())
|
||||
{
|
||||
QMessageBox::warning(NULL,tr("Cannot send distant messages"),tr("In order to send distant messages, you need an identity to sign with. Please go to the Identities tab and create one first."));
|
||||
return ;
|
||||
|
Loading…
Reference in New Issue
Block a user