Changeset 11142 for stable

Timestamp:

07/08/14 18:56:29 (10 years ago)

Author:

mkommend

Message:

#2198: Merged r11012 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (2 diffs)

stable/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -25 +25 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 using HeuristicLab.PluginInfrastructure;
@@ -120 +121 @@
           saveFileDialog.FilterIndex = 2;
         }
-        saveFileDialog.FileName = string.IsNullOrEmpty(content.Filename) ? "Item" : content.Filename;
+
+        INamedItem namedItem = content as INamedItem;
+        string suggestedFileName = string.Empty;
+        if (!string.IsNullOrEmpty(content.Filename)) suggestedFileName = content.Filename;
+        else if (namedItem != null) suggestedFileName = namedItem.Name;
+        else suggestedFileName = "Item";
+
+        saveFileDialog.FileName = suggestedFileName;
 
         if (saveFileDialog.ShowDialog() == DialogResult.OK) {