Merge remote branch 'origin/bugfix/7443_save_dialog_file_extension_bug'

Code/Mantid/Framework/DataHandling/src/SaveSPE.cpp

@@ -81,7 +81,7 @@ namespace Mantid
       wsValidator->add<API::HistogramValidator>();
       declareProperty(new API::WorkspaceProperty<>("InputWorkspace", "", Direction::Input,wsValidator),
         "The input workspace, which must be in Energy Transfer");
-      declareProperty(new FileProperty("Filename","", FileProperty::Save),
+      declareProperty(new FileProperty("Filename","", FileProperty::Save,".spe"),
         "The filename to use for the saved data");
     }
 

Code/Mantid/MantidQt/API/src/FilePropertyWidget.cpp

@@ -169,15 +169,22 @@ namespace API
       {
         // Hack off the first star that the filter returns
         QString ext = selectedFilter;
-        if( selectedFilter.startsWith("*") )
+
+        if( selectedFilter.startsWith("*.") )
         {
           // 1 character from the start
           ext = ext.remove(0,1);
         }
+        else
+        {
+          ext = "";
+        }
+
         if( filename.endsWith(".") && ext.startsWith(".") )
         {
           ext = ext.remove(0,1);
         }
+
         // Construct the full file name
         filename += ext;
       }