DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

Plugins - Added timeout for plugin enable

Browse Source 
Plugins - Delete lock file even on exception, only leave it in place on crash
Plugins - Added --ignore-plugin-lock startup argument
UI - Renamed -autorun argument to --autorun
This commit is contained in:
SpoinkyNL committed 2020-06-29 23:24:49 +02:00
1 parent 40eda4fc2b
commit ac45c4d5d3
11 files changed
+56 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Bootstrapper.cs
+2 -1
View File
@@ -60,12 +60,13 @@ namespace Artemis.UI
{
try
{
if (StartupArguments.Contains("-autorun"))
if (StartupArguments.Contains("--autorun"))
{
logger.Information("Sleeping for 15 seconds on auto run to allow applications like iCUE and LGS to start");
await Task.Delay(TimeSpan.FromSeconds(15));
}
_core.StartupArguments = StartupArguments;
_core.Initialize();
}
catch (Exception e)
src/Artemis.UI/DataModelVisualization/DataModelListViewModel.cs
+1 -2
View File
@@ -33,14 +33,13 @@ namespace Artemis.UI.DataModelVisualization
foreach (var item in List)
{
DataModelVisualizationViewModel child;
if (Children.Count < index )
if (Children.Count < index)
{
child = CreateChild(item);
Children.Add(child);
}
else
{
// TODO: This wont fly when mixing DataModels and DataModelProperties
child = Children[index];
child.Model = item;
}
src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
+1 -1
View File
@@ -211,7 +211,7 @@ namespace Artemis.UI.Screens.Settings
if (File.Exists(autoRunFile))
File.Delete(autoRunFile);
if (StartWithWindows)
ShortcutUtilities.Create(autoRunFile, executableFile, "-autorun", new FileInfo(executableFile).DirectoryName, "Artemis", "", "");
ShortcutUtilities.Create(autoRunFile, executableFile, "--autorun", new FileInfo(executableFile).DirectoryName, "Artemis", "", "");
}
catch (Exception e)
{
src/Artemis.UI/Screens/TrayViewModel.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace Artemis.UI.Screens
_eventAggregator = eventAggregator;
CanShowRootViewModel = true;
var autoRunning = Bootstrapper.StartupArguments.Contains("-autorun");
var autoRunning = Bootstrapper.StartupArguments.Contains("--autorun");
var showOnAutoRun = settingsService.GetSetting("UI.ShowOnStartup", true).Value;
if (!autoRunning || showOnAutoRun)
{