Merge branch 'Better_Graphics_Handling' into Automatic_Covers

Conflicts:
	Vocaluxe/Base/CCover.cs
	Vocaluxe/Base/CGraphics.cs
	Vocaluxe/Base/Fonts/CFontStyle.cs
	Vocaluxe/Base/Fonts/CGlyph.cs
	VocaluxeLib/Menu/CText.cs
	VocaluxeLib/Structs.cs
This commit is contained in:
Flamefire committed 2014-09-25 19:43:21 +02:00
commit dd1231ad34
603 files changed
+25356 -25970

No files matched your search

+2 -2
View File
@@ -81,7 +81,7 @@ namespace Vocaluxe
{
// Init Log
CLog.Init();
CLog.StartBenchmark("Init Program");
if (!CProgrammHelper.CheckRequirements())
return;
CProgrammHelper.Init();
@@ -236,6 +236,7 @@ namespace Vocaluxe
//Only reasonable point to call GC.Collect() because initialization may cause lots of garbage
//Rely on GC doing its job afterwards and call Dispose methods where appropriate
GC.Collect();
CLog.StopBenchmark("Init Program");
}
catch (Exception e)
{
@@ -251,7 +252,6 @@ namespace Vocaluxe
// Start Main Loop
if (_SplashScreen != null)
_SplashScreen.Close();
CVocaluxeServer.Start();
CDraw.MainLoop();
}