diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-06 00:24:11 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-06 00:24:11 -0400 |
| commit | 5bc6c08a0aead61ef8e7566916fbe36a4dc5bd3d (patch) | |
| tree | c44cadafa32e7edf6cff5aae09601e0e2e289a8e /Emby.Dlna/Didl/StringWriterWithEncoding.cs | |
| parent | 410a322fe22302eb3c8a37ea38bbe1d7e9d12aff (diff) | |
| parent | 92af81166d00eb886e1111c4b7dc9788cacc619a (diff) | |
Merge remote-tracking branch 'upstream/master' into simplify-https-config
Diffstat (limited to 'Emby.Dlna/Didl/StringWriterWithEncoding.cs')
| -rw-r--r-- | Emby.Dlna/Didl/StringWriterWithEncoding.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Dlna/Didl/StringWriterWithEncoding.cs b/Emby.Dlna/Didl/StringWriterWithEncoding.cs index 67fc56ec0..896fe992b 100644 --- a/Emby.Dlna/Didl/StringWriterWithEncoding.cs +++ b/Emby.Dlna/Didl/StringWriterWithEncoding.cs @@ -53,6 +53,6 @@ namespace Emby.Dlna.Didl _encoding = encoding; } - public override Encoding Encoding => (null == _encoding) ? base.Encoding : _encoding; + public override Encoding Encoding => _encoding ?? base.Encoding; } } |