Revision: 7397
          http://mahogany.svn.sourceforge.net/mahogany/?rev=7397&view=rev
Author:   vadz
Date:     2007-12-13 11:16:14 -0800 (Thu, 13 Dec 2007)

Log Message:
-----------
don't pass empty extension to wxMimeTypesManager::GetFileTypeFromExtension() as 
it asserts in this case

Modified Paths:
--------------
    trunk/M/src/gui/wxComposeView.cpp

Modified: trunk/M/src/gui/wxComposeView.cpp
===================================================================
--- trunk/M/src/gui/wxComposeView.cpp   2007-12-10 00:13:03 UTC (rev 7396)
+++ trunk/M/src/gui/wxComposeView.cpp   2007-12-13 19:16:14 UTC (rev 7397)
@@ -199,8 +199,10 @@
 
    wxString strMimeType;
    wxMimeTypesManager& mimeManager = mApplication->GetMimeManager();
-   wxFileType *fileType = mimeManager.GetFileTypeFromExtension(strExt);
-   if ( (fileType == NULL) || !fileType->GetMimeType(&strMimeType) )
+   wxFileType *fileType = strExt.empty()
+                           ? NULL
+                           : mimeManager.GetFileTypeFromExtension(strExt);
+   if ( !fileType || !fileType->GetMimeType(&strMimeType) )
    {
       // can't find MIME type from file extension, set some default one: use
       // TEXT/PLAIN for text files and APPLICATION/OCTET-STREAM for binary ones


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to