Improved settings and logging file handling.

1 files changed, 7 insertions, 4 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
index 09cb9a8b6..d663d6088 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
@@ -22,11 +22,14 @@ namespace Tango.MachineStudio.Logging.Parsing
 
             String logFile = logger != null ? logger.LogFile : null;
 
-            foreach (var file in Directory.GetFiles(SettingsManager.Default.Folder + "\\embedded logs", "*.log").Where(x => Path.GetFileName(x).StartsWith("embedded") && x != logFile))
+            if (Directory.Exists(MachineOperator.EmbeddedLogsFolder))
             {
-                String dateString = Path.GetFileNameWithoutExtension(file).Replace("embedded-", "");
-                DateTime date = DateTime.ParseExact(dateString, "dd-MM-yyyy_HH-mm-ss", CultureInfo.InvariantCulture);
-                logFiles.Add(new LogFile() { DateTime = date, File = file });
+                foreach (var file in Directory.GetFiles(MachineOperator.EmbeddedLogsFolder, "*.log").Where(x => x != logFile))
+                {
+                    String dateString = Path.GetFileNameWithoutExtension(file).Replace(MachineOperator.EmbeddedLogsTag + "-", "");
+                    DateTime date = DateTime.ParseExact(dateString, "dd-MM-yyyy_HH-mm-ss", CultureInfo.InvariantCulture);
+                    logFiles.Add(new LogFile() { DateTime = date, File = file });
+                }
             }
 
             return logFiles;