X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fmessage.cpp;h=d7aaf3fc12bf26896b5cccedb999fa6a08ed00ad;hp=c0bed87b95d924608af95d2a9bd73a78d5ecda79;hb=44f964d9b2b2d55a5b5672e9297717bd25fa8ee2;hpb=52581afffd81f5a71c129d87e3ac822d9522f12d

diff --git a/src/message.cpp b/src/message.cpp
index c0bed87..d7aaf3f 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -696,8 +696,9 @@ const bool Message::ParseNNTPMessage(const std::string &nntpmessage)
 			m_body+=bodypart;
 		}
 		// add a binary file attachment
-		else if((*i)->GetName()!="" && (*i)->GetLength()>0 && (*i)->GetContent())
+		else if(((*i)->GetName()!="" || (*i)->GetFilename()!="") && (*i)->GetLength()>0 && (*i)->GetContent())
 		{
+			std::string filename="";
 			std::string contenttype="";
 			std::vector<unsigned char> data((*i)->GetContent(),(*i)->GetContent()+(*i)->GetContentLength());
 			if((*i)->GetContentType())
@@ -710,7 +711,12 @@ const bool Message::ParseNNTPMessage(const std::string &nntpmessage)
 					contenttype.erase(endpos);
 				}
 			}
-			m_fileattachments.push_back(fileattachment((*i)->GetName(),contenttype,data));
+			filename=(*i)->GetFilename();
+			if(filename=="")
+			{
+				filename=(*i)->GetName();
+			}
+			m_fileattachments.push_back(fileattachment(filename,contenttype,data));
 		}
 	}