Merge branch 'hotfix/0.8.2'

TheSylence · Oct 17, 2016 · eb9cd86 · eb9cd86
2 parents 149c42e + 76a43de
commit eb9cd86
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/Twice.smproj b/Twice.smproj
diff --git a/Twice/Behaviors/MediaController.cs b/Twice/Behaviors/MediaController.cs
@@ -11,7 +11,14 @@ internal class MediaController : BehaviorBase<MediaElement>
 	{
 		protected override void OnCleanup()
 		{
-			AssociatedObject?.Stop();
+			try
+			{
+				AssociatedObject?.Stop();
+			}
+			catch( InvalidOperationException ex )
+			{
+				LogTo.WarnException( "Failed to cleanup.", ex );
+			}
 		}
 
 		protected override void OnAttached()

diff --git a/Twice/Properties/AssemblyInfo.cs b/Twice/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 [assembly: ComVisible( false )]
 [assembly: ThemeInfo( ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly )]
 [assembly: LogMinimalMessage]
-[assembly: AssemblyVersion( "0.8.1.0" )]
-[assembly: AssemblyFileVersion( "0.8.1.0" )]
+[assembly: AssemblyVersion( "0.8.2.0" )]
+[assembly: AssemblyFileVersion( "0.8.2.0" )]
 [assembly: InternalsVisibleTo( "Twice.Tests" )]
 [assembly: InternalsVisibleTo( "DynamicProxyGenAssembly2" )]
diff --git a/Twice/Resources/Texts/Changelog.json b/Twice/Resources/Texts/Changelog.json
@@ -1,4 +1,15 @@
 [
+    {
+        "Version": "0.8.2",
+        "Date": "2016-10-17",
+        "Description": "",
+        "NewFeatures": [],
+        "Changes": [],
+        "Fixes": [
+            "Fixed crash that could occur when loading inline media"
+        ],
+        "Issues": []
+    },
     {
         "Version": "0.8.1",
         "Date": "2016-10-17",