Commit Graph

10 Commits

Author SHA1 Message Date
Luke Pulverenti
46c9210749 Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev 2015-03-26 00:44:29 -04:00
Luke Pulverenti
70fb64cc05 subtitle parsing fixes 2015-03-26 00:44:24 -04:00
Mike
a1a6366833 Fix null reference exception when awaiting null.
DynamicImageProvider:CreateImageAsync was not marked as async. When returning null the await BaseDynamicImageProvider:FetchToFileInternal would throw a null reference exception. An alternative solution would be to wrap the null return in Task.FromResult.

Object reference not set to an instance of an object.
	System.NullReferenceException
	   at MediaBrowser.Server.Implementations.Photos.BaseDynamicImageProvider`1.<FetchToFileInternal>d__c.MoveNext() in c:\MediaBrowser\MediaBrowser.Server.Implementations\Photos\BaseDynamicImageProvider.cs:line 79
2015-03-25 21:30:26 -04:00
Luke Pulverenti
e62270df35 add socket error message 2015-03-24 21:34:34 -04:00
Luke Pulverenti
1fb24df504 add query by PersonId 2015-03-18 12:40:16 -04:00
Luke Pulverenti
6b278f9b04 stub out localizable plugin 2015-03-17 22:39:55 -04:00
Luke Pulverenti
e8161cf8ac update dynamic images 2015-03-15 23:41:12 -04:00
Luke Pulverenti
4506d3faa1 update dynamic images 2015-03-15 21:48:25 -04:00
Luke Pulverenti
cf0456360b rework dynamic image provider 2015-03-14 13:02:51 -04:00
Luke Pulverenti
0708dc953e add live tv collage 2015-03-14 11:38:16 -04:00