Moved IsMO2Running to Utils.cs, added check for MO2 inside the selected profile folder

This commit is contained in:
erri120 2019-11-01 11:55:50 +01:00
parent 108d7dc0d5
commit fa51cd4d69
No known key found for this signature in database
GPG Key ID: A8C0A18D8D4D3135
2 changed files with 13 additions and 9 deletions

View File

@ -26,6 +26,12 @@ namespace Wabbajack.Common
{
public static class Utils
{
public static bool IsMO2Running(string mo2Path)
{
Process[] processList = Process.GetProcesses();
return processList.Select(process => (process.ProcessName == "ModOrganizer" && Path.GetDirectoryName(process.MainModule?.FileName) == mo2Path)).FirstOrDefault();
}
public static string LogFile { get; private set; }
static Utils()
{

View File

@ -85,15 +85,6 @@ namespace Wabbajack
Environment.Exit(1);
}
Process[] processList = Process.GetProcesses();
foreach (var process in processList)
{
if (process.ProcessName != "ModOrganizer") continue;
MessageBox.Show("You need to close MO2 before running Wabbajack!",
"Error", MessageBoxButton.OK);
Environment.Exit(1);
}
Mode = mode;
// Define commands
@ -289,6 +280,13 @@ namespace Wabbajack
this.ModListName = profile_name;
this.Mode = RunMode.Compile;
if (Utils.IsMO2Running(mo2folder))
{
MessageBox.Show("You need to close MO2 before running Wabbajack!",
"Error", MessageBoxButton.OK);
Environment.Exit(1);
}
var tmp_compiler = new Compiler(mo2folder);
DownloadLocation = tmp_compiler.MO2DownloadsFolder;