diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-05-26 20:52:05 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-05-26 20:52:05 -0400 |
| commit | 7c823464bca70570f2f53f8af6913e53d385b784 (patch) | |
| tree | 6ef5c8ef0374967a661dade6d3d281d6d22dde6a /Jellyfin.Data/Entities | |
| parent | 01ce56016a3e7189cf29b22b095dc15b82a19303 (diff) | |
Fix merge conflicts with SyncPlay
Diffstat (limited to 'Jellyfin.Data/Entities')
| -rw-r--r-- | Jellyfin.Data/Entities/User.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs index 2287d802b5..0a46617809 100644 --- a/Jellyfin.Data/Entities/User.cs +++ b/Jellyfin.Data/Entities/User.cs @@ -61,6 +61,7 @@ namespace Jellyfin.Data.Entities EnableAutoLogin = false; PlayDefaultAudioTrack = true; SubtitleMode = SubtitlePlaybackMode.Default; + SyncPlayAccess = SyncPlayAccess.CreateAndJoinGroups; AddDefaultPermissions(); AddDefaultPreferences(); @@ -319,6 +320,9 @@ namespace Jellyfin.Data.Entities /// </summary> public virtual ImageInfo ProfileImage { get; set; } + [Required] + public SyncPlayAccess SyncPlayAccess { get; set; } + /// <summary> /// Gets or sets the row version. /// </summary> |