handle C++ exception in EVT_{TIMER,IDLE} handlers (#9768)

[wxWidgets.git] / src / unix / mimetype.cpp

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index a2baf6f0e9f4c6dbd3eb3a9908fe1c963b0d47c0..1bce2f312171102f6d2395b4e1f0ba279aab4ba3 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -265,7 +265,7 @@ void wxMimeTypesManagerImpl::LoadXDGGlobs(const wxString& filename)
        wxArrayString exts;
        exts.Add( ext );
        
-       AddToMimeData(mime, wxEmptyString, NULL, exts, wxEmptyString, false );
+       AddToMimeData(mime, wxEmptyString, NULL, exts, wxEmptyString, true );
     }
 }
 
@@ -528,6 +528,7 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
 
     // Read MIME type - extension associations
     LoadXDGGlobs( "/usr/share/mime/globs" );
+    LoadXDGGlobs( "/usr/local/share/mime/globs" );
 
     // Load desktop files for XDG, and then override them with the defaults.
     // We will override them one desktop file at a time, rather