mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-11 23:49:38 -05:00
fixed error handling when you enter your own certificate in connect friend wizard
This commit is contained in:
parent
24781a71f5
commit
974102e3fc
@ -596,7 +596,7 @@ static void sendMail(QString sAddress, QString sSubject, QString sBody)
|
||||
|
||||
bool ConnectFriendWizard::validateCurrentPage()
|
||||
{
|
||||
error = true;
|
||||
error = false;
|
||||
|
||||
switch ((Page) currentId()) {
|
||||
case Page_WebMail:
|
||||
@ -616,14 +616,14 @@ bool ConnectFriendWizard::validateCurrentPage()
|
||||
if(peerDetails.id == rsPeers->getOwnId())
|
||||
{
|
||||
setField("errorMessage", tr("This is your own certificate! You would not want to make friend with yourself. Wouldn't you?") ) ;
|
||||
error = false;
|
||||
error = true;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
// error message
|
||||
setField("errorMessage", tr("Certificate Load Failed") + ": \n\n" + getErrorString(cert_load_error_code)) ;
|
||||
error = false;
|
||||
error = true;
|
||||
break;
|
||||
}
|
||||
case Page_ErrorMessage:
|
||||
@ -638,7 +638,7 @@ bool ConnectFriendWizard::validateCurrentPage()
|
||||
int ConnectFriendWizard::nextId() const
|
||||
{
|
||||
switch ((Page) currentId()) {
|
||||
case Page_Text: return Page_Conclusion;
|
||||
case Page_Text: return error?Page_ErrorMessage:Page_Conclusion;
|
||||
case Page_WebMail:
|
||||
case Page_ErrorMessage:
|
||||
case Page_Conclusion:
|
||||
|
Loading…
Reference in New Issue
Block a user