ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-19 22:37:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'net5'

Browse source
This commit is contained in:
goaaats 2022-06-27 00:27:51 +02:00
commit d79e300750
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/EntryPoint.cs
View file

@ -320,11 +320,14 @@ namespace Dalamud
config.Save(); config.Save();
} }
Log.CloseAndFlush();
Environment.Exit(-1); Environment.Exit(-1);
break; break;
default: default:
Log.Fatal("Unhandled SEH object on AppDomain: {Object}", args.ExceptionObject); Log.Fatal("Unhandled SEH object on AppDomain: {Object}", args.ExceptionObject);
Log.CloseAndFlush();
Environment.Exit(-1);
break; break;
} }
} }

2
Dalamud/Interface/Internal/InterfaceManager.cs
View file

@ -68,8 +68,8 @@ namespace Dalamud.Interface.Internal
// can't access imgui IO before first present call // can't access imgui IO before first present call
private bool lastWantCapture = false; private bool lastWantCapture = false;
private bool isRebuildingFonts = false; private bool isRebuildingFonts = false;
private bool isOverrideGameCursor = false;
private bool isFallbackFontMode = false; private bool isFallbackFontMode = false;
private bool isOverrideGameCursor = true;
[ServiceManager.ServiceConstructor] [ServiceManager.ServiceConstructor]
private InterfaceManager() private InterfaceManager()