aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs5
-rw-r--r--MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs9
2 files changed, 8 insertions, 6 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 1f9826d54..32c93454d 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -283,11 +283,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
}
- if (!process.WaitForExit(5000))
- {
- StopProcess(processWrapper, 100, true);
- }
-
return mediaInfo;
}
}
diff --git a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
index d171c4aa4..504df02d5 100644
--- a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
+++ b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
@@ -258,7 +258,14 @@ namespace MediaBrowser.Providers.Movies
{
foreach (var person in movieData.casts.crew)
{
- resultItem.AddPerson(new PersonInfo { Name = person.name.Trim(), Role = person.job, Type = person.department });
+ // Normalize this
+ var type = person.department;
+ if (string.Equals(type, "writing", StringComparison.OrdinalIgnoreCase))
+ {
+ type = PersonType.Writer;
+ }
+
+ resultItem.AddPerson(new PersonInfo { Name = person.name.Trim(), Role = person.job, Type = type });
}
}