diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-05 10:07:17 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-05 10:07:17 -0400 |
| commit | f91f2ef328a9d7693956ab33bf5c70be2f1213df (patch) | |
| tree | b1e0bba89071f6930e0c9b08c8e6ff086f8120d3 /Emby.Dlna/Didl/StringWriterWithEncoding.cs | |
| parent | f2760cb055ae6ee5971ca4a3ff342ecd7d829d99 (diff) | |
| parent | 29539174a3de47c151cc7c7fd192100e6fbe48d7 (diff) | |
Merge remote-tracking branch 'upstream/master' into register-services-correctly
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; } } |