Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-04 09:05:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed error handling when you enter your own certificate in connect friend wizard

Browse Source
This commit is contained in:
csoler 2019-09-28 17:29:24 +02:00
parent 24781a71f5
commit 974102e3fc
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -596,7 +596,7 @@ static void sendMail(QString sAddress, QString sSubject, QString sBody)
bool ConnectFriendWizard::validateCurrentPage() bool ConnectFriendWizard::validateCurrentPage()
{ {
error = true; error = false;
switch ((Page) currentId()) { switch ((Page) currentId()) {
case Page_WebMail: case Page_WebMail:
@ -616,14 +616,14 @@ bool ConnectFriendWizard::validateCurrentPage()
if(peerDetails.id == rsPeers->getOwnId()) 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?") ) ; 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; break;
} }
// error message // error message
setField("errorMessage", tr("Certificate Load Failed") + ": \n\n" + getErrorString(cert_load_error_code)) ; setField("errorMessage", tr("Certificate Load Failed") + ": \n\n" + getErrorString(cert_load_error_code)) ;
error = false; error = true;
break; break;
} }
case Page_ErrorMessage: case Page_ErrorMessage:
@ -638,7 +638,7 @@ bool ConnectFriendWizard::validateCurrentPage()
int ConnectFriendWizard::nextId() const int ConnectFriendWizard::nextId() const
{ {
switch ((Page) currentId()) { switch ((Page) currentId()) {
case Page_Text: return Page_Conclusion; case Page_Text: return error?Page_ErrorMessage:Page_Conclusion;
case Page_WebMail: case Page_WebMail:
case Page_ErrorMessage: case Page_ErrorMessage:
case Page_Conclusion: case Page_Conclusion: