- [Core] fix crash issue when opening multiple instances.
This commit is contained in:
@@ -39,8 +39,8 @@ namespace AssetStudio.CLI
|
|||||||
}
|
}
|
||||||
|
|
||||||
Studio.Game = game;
|
Studio.Game = game;
|
||||||
Logger.LogVerbose = o.Verbose;
|
|
||||||
Logger.Default = new ConsoleLogger();
|
Logger.Default = new ConsoleLogger();
|
||||||
|
Logger.LogVerbose = o.Verbose;
|
||||||
Logger.FileLogging = Settings.Default.enableFileLogging;
|
Logger.FileLogging = Settings.Default.enableFileLogging;
|
||||||
AssetsHelper.Minimal = Settings.Default.minimalAssetMap;
|
AssetsHelper.Minimal = Settings.Default.minimalAssetMap;
|
||||||
AssetsHelper.SetUnityVersion(o.UnityVersion);
|
AssetsHelper.SetUnityVersion(o.UnityVersion);
|
||||||
|
|||||||
@@ -115,8 +115,6 @@ namespace AssetStudio.GUI
|
|||||||
|
|
||||||
private void InitializeLogger()
|
private void InitializeLogger()
|
||||||
{
|
{
|
||||||
Logger.LogVerbose = enableVerbose.Checked;
|
|
||||||
Logger.FileLogging = enableFileLogging.Checked;
|
|
||||||
logger = new GUILogger(StatusStripUpdate);
|
logger = new GUILogger(StatusStripUpdate);
|
||||||
ConsoleHelper.AllocConsole();
|
ConsoleHelper.AllocConsole();
|
||||||
ConsoleHelper.SetConsoleTitle("Debug Console");
|
ConsoleHelper.SetConsoleTitle("Debug Console");
|
||||||
@@ -131,6 +129,8 @@ namespace AssetStudio.GUI
|
|||||||
Logger.Default = logger;
|
Logger.Default = logger;
|
||||||
ConsoleHelper.ShowWindow(handle, ConsoleHelper.SW_HIDE);
|
ConsoleHelper.ShowWindow(handle, ConsoleHelper.SW_HIDE);
|
||||||
}
|
}
|
||||||
|
Logger.LogVerbose = enableVerbose.Checked;
|
||||||
|
Logger.FileLogging = enableFileLogging.Checked;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void InitializeProgressBar()
|
private void InitializeProgressBar()
|
||||||
|
|||||||
@@ -22,9 +22,18 @@ namespace AssetStudio
|
|||||||
{
|
{
|
||||||
_fileLogging = value;
|
_fileLogging = value;
|
||||||
if (_fileLogging)
|
if (_fileLogging)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
File = new FileLogger();
|
File = new FileLogger();
|
||||||
}
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
_fileLogging = false;
|
||||||
|
Error("log file is already in use, disabling...");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
((FileLogger)File)?.Writer?.Dispose();
|
((FileLogger)File)?.Writer?.Dispose();
|
||||||
|
|||||||
Reference in New Issue
Block a user