open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix resource load crash

Browse Source
pull/1154/head
Bond_009 6 years ago
parent a73d255f51
commit 7792a9a9af
3 changed files with 7 additions and 108 deletions
Show Stats Download Patch File Download Diff File

1
Emby.Server.Implementations/ApplicationHost.cs
Unescape View File

@ -2531,6 +2531,7 @@ namespace Emby.Server.Implementations
return null;
}
// TODO: @bond Remove?
private Dictionary<string, string> LoadValues()
{
Dictionary<string, string> values = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

112
Emby.Server.Implementations/Emby.Server.Implementations.csproj
Unescape View File

@ -41,113 +41,11 @@
<ItemGroup>
<EmbeddedResource Include="Localization\iso6392.txt" />
<EmbeddedResource Include="Localization\countries.json" />
<EmbeddedResource Include="Localization\Core\ar.json" />
<EmbeddedResource Include="Localization\Core\bg-BG.json" />
<EmbeddedResource Include="Localization\Core\ca.json" />
<EmbeddedResource Include="Localization\Core\cs.json" />
<EmbeddedResource Include="Localization\Core\da.json" />
<EmbeddedResource Include="Localization\Core\de.json" />
<EmbeddedResource Include="Localization\Core\en-GB.json" />
<EmbeddedResource Include="Localization\Core\es-AR.json" />
<EmbeddedResource Include="Localization\Core\es-MX.json" />
<EmbeddedResource Include="Localization\Core\es.json" />
<EmbeddedResource Include="Localization\Core\fr-CA.json" />
<EmbeddedResource Include="Localization\Core\fr.json" />
<EmbeddedResource Include="Localization\Core\he.json" />
<EmbeddedResource Include="Localization\Core\hr.json" />
<EmbeddedResource Include="Localization\Core\hu.json" />
<EmbeddedResource Include="Localization\Core\it.json" />
<EmbeddedResource Include="Localization\Core\kk.json" />
<EmbeddedResource Include="Localization\Core\ko.json" />
<EmbeddedResource Include="Localization\Core\lt-LT.json" />
<EmbeddedResource Include="Localization\Core\ms.json" />
<EmbeddedResource Include="Localization\Core\nb.json" />
<EmbeddedResource Include="Localization\Core\nl.json" />
<EmbeddedResource Include="Localization\Core\pl.json" />
<EmbeddedResource Include="Localization\Core\pt-BR.json" />
<EmbeddedResource Include="Localization\Core\pt-PT.json" />
<EmbeddedResource Include="Localization\Core\ru.json" />
<EmbeddedResource Include="Localization\Core\sk.json" />
<EmbeddedResource Include="Localization\Core\sl-SI.json" />
<EmbeddedResource Include="Localization\Core\sv.json" />
<EmbeddedResource Include="Localization\Core\tr.json" />
<EmbeddedResource Include="Localization\Core\zh-CN.json" />
<EmbeddedResource Include="Localization\Core\zh-HK.json" />
<EmbeddedResource Include="Localization\Core\en-US.json" />
<EmbeddedResource Include="Localization\Core\el.json" />
<EmbeddedResource Include="Localization\Core\gsw.json" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\afr" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ara" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ben" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\bul" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ces" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\dan" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\deu" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ell" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\eng" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\est" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\fas" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\fin" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\fra" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\guj" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\heb" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\hin" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\hrv" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\hun" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ind" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ita" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\jpn" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\kan" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\kor" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\lav" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\lit" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\mal" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\mar" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\mkd" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\nep" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\nld" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\nor" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\pan" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\pol" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\por" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ron" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\rus" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\slk" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\slv" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\som" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\spa" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\sqi" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\swa" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\swe" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tam" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tel" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tgl" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tha" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tur" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ukr" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\urd" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\vie" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\zh-cn" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\zh-tw" />
<EmbeddedResource Include="Localization\Core\*.json" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\*" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Utils\messages.properties" />
<EmbeddedResource Include="Localization\Ratings\*.txt" />
<EmbeddedResource Include="values.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Localization\Ratings\br.txt" />
<EmbeddedResource Include="Localization\Ratings\ca.txt" />
<EmbeddedResource Include="Localization\Ratings\co.txt" />
<EmbeddedResource Include="Localization\Ratings\dk.txt" />
<EmbeddedResource Include="Localization\Ratings\fr.txt" />
<EmbeddedResource Include="Localization\Ratings\gb.txt" />
<EmbeddedResource Include="Localization\Ratings\ie.txt" />
<EmbeddedResource Include="Localization\Ratings\jp.txt" />
<EmbeddedResource Include="Localization\Ratings\kz.txt" />
<EmbeddedResource Include="Localization\Ratings\mx.txt" />
<EmbeddedResource Include="Localization\Ratings\nl.txt" />
<EmbeddedResource Include="Localization\Ratings\nz.txt" />
<EmbeddedResource Include="Localization\Ratings\us.txt" />
<EmbeddedResource Include="Localization\Ratings\uk.txt" />
<EmbeddedResource Include="Localization\Ratings\es.txt" />
<EmbeddedResource Include="Localization\Ratings\ro.txt" />
</ItemGroup>
</Project>

2
Emby.Server.Implementations/Session/SessionManager.cs
Unescape View File

@ -1901,4 +1901,4 @@ namespace Emby.Server.Implementations.Session
return user != null && user.Policy.IsAdministrator;
}
}
}
}

Write Preview
Loading…
Cancel
Save