Merge branch 'net5'

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

View file

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

View file

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