summaryrefslogtreecommitdiff
path: root/src/net/eathena/mail2recv.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-25 23:55:43 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-25 23:55:43 +0300
commitd0768817618143739b8fd81cfa9124e8f60e1b12 (patch)
tree94450009f3bf4cd7726250633865f0a112f625fb /src/net/eathena/mail2recv.cpp
parentf7d3792df9fd01ea7baabaf9b612031b1f28d7ab (diff)
downloadmv-d0768817618143739b8fd81cfa9124e8f60e1b12.tar.gz
mv-d0768817618143739b8fd81cfa9124e8f60e1b12.tar.bz2
mv-d0768817618143739b8fd81cfa9124e8f60e1b12.tar.xz
mv-d0768817618143739b8fd81cfa9124e8f60e1b12.zip
Validate destination name after it entered in mail edit window.
Diffstat (limited to 'src/net/eathena/mail2recv.cpp')
-rw-r--r--src/net/eathena/mail2recv.cpp22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/net/eathena/mail2recv.cpp b/src/net/eathena/mail2recv.cpp
index 3da4ae4c5..fe36172b9 100644
--- a/src/net/eathena/mail2recv.cpp
+++ b/src/net/eathena/mail2recv.cpp
@@ -63,6 +63,7 @@ namespace EAthena
namespace Mail2Recv
{
std::queue<MailQueue*> mMailQueue;
+ std::string mCheckedName;
} // namespace Mail2Recv
void Mail2Recv::processMailIcon(Net::MessageIn &msg)
@@ -255,6 +256,7 @@ void Mail2Recv::processCheckNameResult(Net::MessageIn &msg)
delete mail;
return;
}
+ mCheckedName = mail->to;
switch (mail->type)
{
case MailQueueType::SendMail:
@@ -264,10 +266,26 @@ void Mail2Recv::processCheckNameResult(Net::MessageIn &msg)
mail->money);
break;
case MailQueueType::EditMail:
- mailWindow->createMail(mail->to);
+ if (mailWindow == nullptr)
+ {
+ reportAlways("Mail window not created");
+ }
+ else
+ {
+ mailWindow->createMail(mail->to);
+ }
+ break;
+ case MailQueueType::ValidateTo:
+ if (mailEditWindow == nullptr)
+ {
+ reportAlways("Mail edit window not created");
+ }
+ else
+ {
+ mailEditWindow->validatedTo();
+ }
break;
case MailQueueType::Unknown:
- case MailQueueType::ValidateTO:
default:
reportAlways("Not implemented yet.");
break;