Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into Better_Graphics_Handling
Conflicts: Vocaluxe/COSFunctions.cs VocaluxeLib/CHelper.cs VocaluxeLib/Menu/CStatic.cs VocaluxeLib/Structs.cs
This commit is contained in:
commit
c156fa69ab
550 files changed
+22434
-23687
No files matched your search
@@ -60,44 +60,6 @@ namespace Vocaluxe
|
||||
Environment.SetEnvironmentVariable("PATH", newPath);
|
||||
}
|
||||
|
||||
public static void AddLibrarySearchpath(string path)
|
||||
{
|
||||
#if WIN
|
||||
if (!_DefaultDllDirSet)
|
||||
{
|
||||
try
|
||||
{
|
||||
// SetDefaultDllDirectories may cause a bug: http://stackoverflow.com/questions/25818073/using-setdefaultdlldirectories-breaks-font-handling
|
||||
#pragma warning disable 168
|
||||
Font dummyForWorkaround = SystemFonts.DefaultFont;
|
||||
#pragma warning restore 168
|
||||
CWindowsFunctions.SetDefaultDllDirectories(CWindowsFunctions.LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
_UsePath = true;
|
||||
_UseSetDllDir = true;
|
||||
}
|
||||
_DefaultDllDirSet = true;
|
||||
}
|
||||
if (_UsePath)
|
||||
AddEnvironmentPath(path);
|
||||
if (!_UseSetDllDir)
|
||||
{
|
||||
try
|
||||
{
|
||||
CWindowsFunctions.AddDllDirectory(path);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
_UseSetDllDir = true;
|
||||
}
|
||||
}
|
||||
if (_UseSetDllDir)
|
||||
CWindowsFunctions.SetDllDirectory(path);
|
||||
#endif
|
||||
}
|
||||
|
||||
public static void SetForegroundWindow(IntPtr hWnd)
|
||||
{
|
||||
#if WIN
|
||||
|
||||
Reference in new issue
Block a user