1 files changed, 7 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index a01375212..09eb1ab1c 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -34,15 +34,19 @@ namespace Tango.Integration.Operation
         private bool _diagnosticsSent;
         private bool _debugSent;
 
+        public static String EmbeddedLogsFolder { get; private set; }
+        public static String EmbeddedLogsTag { get; private set; }
+
         static MachineOperator()
         {
             if (EmbeddedLogManager == null)
             {
                 EmbeddedLogManager = new LogManager();
 
-                String folder = SettingsManager.Default.Folder + "\\embedded logs";
-                Directory.CreateDirectory(folder);
-                FileLogger fileLogger = new FileLogger(folder, "embedded") { Enabled = true };
+                EmbeddedLogsTag = "Embedded";
+                EmbeddedLogsFolder = Path.Combine(Path.GetDirectoryName(SettingsManager.Default.Folder), "Logs", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName), "Embedded");
+                Directory.CreateDirectory(EmbeddedLogsFolder);
+                FileLogger fileLogger = new FileLogger(EmbeddedLogsFolder, EmbeddedLogsTag) { Enabled = true };
                 EmbeddedLogManager.RegisterLogger(fileLogger);
             }
         }