mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Do not initialize console before loading GUI.
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using DiscImageChef.Console;
|
|
||||||
using DiscImageChef.Core;
|
using DiscImageChef.Core;
|
||||||
using DiscImageChef.Database;
|
using DiscImageChef.Database;
|
||||||
using DiscImageChef.Gui.Forms;
|
using DiscImageChef.Gui.Forms;
|
||||||
@@ -30,10 +29,6 @@ namespace DiscImageChef.Gtk
|
|||||||
AssemblyInformationalVersionAttribute;
|
AssemblyInformationalVersionAttribute;
|
||||||
AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
|
AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
|
||||||
|
|
||||||
DicConsole.WriteLineEvent += System.Console.WriteLine;
|
|
||||||
DicConsole.WriteEvent += System.Console.Write;
|
|
||||||
DicConsole.ErrorWriteLineEvent += System.Console.Error.WriteLine;
|
|
||||||
|
|
||||||
Settings.Settings.LoadSettings();
|
Settings.Settings.LoadSettings();
|
||||||
|
|
||||||
DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
|
DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
|
||||||
|
|||||||
@@ -100,10 +100,6 @@
|
|||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
|
|
||||||
<Project>{ccaa7afe-c094-4d82-a66d-630de8a3f545}</Project>
|
|
||||||
<Name>DiscImageChef.Console</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj">
|
<ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj">
|
||||||
<Project>{679659b8-25d0-4279-b632-56ef8f94adc0}</Project>
|
<Project>{679659b8-25d0-4279-b632-56ef8f94adc0}</Project>
|
||||||
<Name>DiscImageChef.Core</Name>
|
<Name>DiscImageChef.Core</Name>
|
||||||
|
|||||||
@@ -32,7 +32,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using DiscImageChef.Console;
|
|
||||||
using DiscImageChef.Core;
|
using DiscImageChef.Core;
|
||||||
using DiscImageChef.Database;
|
using DiscImageChef.Database;
|
||||||
using DiscImageChef.Gui.Forms;
|
using DiscImageChef.Gui.Forms;
|
||||||
@@ -61,10 +60,6 @@ namespace DiscImageChef.Gtk
|
|||||||
AssemblyInformationalVersionAttribute;
|
AssemblyInformationalVersionAttribute;
|
||||||
AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
|
AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
|
||||||
|
|
||||||
DicConsole.WriteLineEvent += System.Console.WriteLine;
|
|
||||||
DicConsole.WriteEvent += System.Console.Write;
|
|
||||||
DicConsole.ErrorWriteLineEvent += System.Console.Error.WriteLine;
|
|
||||||
|
|
||||||
Settings.Settings.LoadSettings();
|
Settings.Settings.LoadSettings();
|
||||||
|
|
||||||
DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
|
DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
|
||||||
|
|||||||
@@ -81,10 +81,6 @@
|
|||||||
<None Include="App.config" />
|
<None Include="App.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
|
|
||||||
<Project>{ccaa7afe-c094-4d82-a66d-630de8a3f545}</Project>
|
|
||||||
<Name>DiscImageChef.Console</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj">
|
<ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj">
|
||||||
<Project>{679659b8-25d0-4279-b632-56ef8f94adc0}</Project>
|
<Project>{679659b8-25d0-4279-b632-56ef8f94adc0}</Project>
|
||||||
<Name>DiscImageChef.Core</Name>
|
<Name>DiscImageChef.Core</Name>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using DiscImageChef.Console;
|
|
||||||
using DiscImageChef.Core;
|
using DiscImageChef.Core;
|
||||||
using DiscImageChef.Database;
|
using DiscImageChef.Database;
|
||||||
using DiscImageChef.Gui.Forms;
|
using DiscImageChef.Gui.Forms;
|
||||||
@@ -30,10 +29,6 @@ namespace DiscImageChef.Wpf
|
|||||||
AssemblyInformationalVersionAttribute;
|
AssemblyInformationalVersionAttribute;
|
||||||
AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
|
AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
|
||||||
|
|
||||||
DicConsole.WriteLineEvent += System.Console.WriteLine;
|
|
||||||
DicConsole.WriteEvent += System.Console.Write;
|
|
||||||
DicConsole.ErrorWriteLineEvent += System.Console.Error.WriteLine;
|
|
||||||
|
|
||||||
Settings.Settings.LoadSettings();
|
Settings.Settings.LoadSettings();
|
||||||
|
|
||||||
DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
|
DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
|
||||||
|
|||||||
Reference in New Issue
Block a user