Merge pull request #1597 from Windchild292/dev_Windchild_ResetLogFile

MegaMek Log File is Reset on MekHQ load
MegaMek · Mar 29, 2020 · 5646d57 · 5646d57
2 parents ec09191 + 7f3229b
commit 5646d57
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/MekHQ/src/mekhq/MekHQ.java b/MekHQ/src/mekhq/MekHQ.java
@@ -96,6 +96,7 @@ public class MekHQ implements GameListener {
 	public static String CAMPAIGN_DIRECTORY = "./campaigns/";
 	public static String PREFERENCES_FILE = "mmconf/mekhq.preferences";
 	public static String PRESET_DIR = "./mmconf/mhqPresets/";
+	public static String DEFAULT_LOG_FILE_NAME = "mekhqlog.txt";
 
 	private static final EventBus EVENT_BUS = new EventBus();
 
@@ -365,11 +366,16 @@ public static void main(String[] args) {
     	System.setProperty("apple.laf.useScreenMenuBar", "true");
         System.setProperty("com.apple.mrj.application.apple.menu.about.name","MekHQ");
 
-        // TODO : logFileName should probably not be inline
-        String logFileName = "logs" + File.separator + "mekhqlog.txt";
-        getLogger().resetLogFile(logFileName);
+        // We need to reset both the MekHQ and MegaMek log files for now, as we route output to them
+        // both
+        String logFileNameMHQ = PreferenceManager.getClientPreferences().getLogDirectory()
+                + File.separator + DEFAULT_LOG_FILE_NAME;
+        String logFileNameMM = PreferenceManager.getClientPreferences().getLogDirectory()
+                + File.separator + MegaMek.DEFAULT_LOG_FILE_NAME;
+        getLogger().resetLogFile(logFileNameMHQ);
+        getLogger().resetLogFile(logFileNameMM);
         // redirect output to log file
-        redirectOutput(logFileName); // Deprecated call required for MegaMek usage
+        redirectOutput(logFileNameMHQ); // Deprecated call required for MegaMek usage
 
         SwingUtilities.invokeLater(() -> MekHQ.getInstance().startup());
     }