diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2020-04-11 20:10:16 +0900 |
|---|---|---|
| committer | dkanada <dkanada@users.noreply.github.com> | 2020-04-11 20:10:16 +0900 |
| commit | bd55bdb4e3ff4555a722321f92a4783f913204f3 (patch) | |
| tree | 1cdfcd2c8da8bfc79922c3bacf17d87ae448b701 /Emby.Dlna/Didl/StringWriterWithEncoding.cs | |
| parent | cbe1fe2c8f82af2233201203367ba8a532dbec8b (diff) | |
| parent | 299541f1b26136ef89741f28c7949cda4e5e485f (diff) | |
merge branch master into plugin
Diffstat (limited to 'Emby.Dlna/Didl/StringWriterWithEncoding.cs')
| -rw-r--r-- | Emby.Dlna/Didl/StringWriterWithEncoding.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Emby.Dlna/Didl/StringWriterWithEncoding.cs b/Emby.Dlna/Didl/StringWriterWithEncoding.cs index edc258899..896fe992b 100644 --- a/Emby.Dlna/Didl/StringWriterWithEncoding.cs +++ b/Emby.Dlna/Didl/StringWriterWithEncoding.cs @@ -1,5 +1,4 @@ #pragma warning disable CS1591 -#pragma warning disable SA1600 using System; using System.IO; @@ -54,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; } } |