From b107f71d16e72741f786ec1965021790ffd3b527 Mon Sep 17 00:00:00 2001
From: Matthias Specht <sylence@btbsoft.org>
Date: Mon, 17 Oct 2016 19:34:18 +0200
Subject: [PATCH 1/2] Fixed crash that could occur when loading inline media

---
 Twice/Behaviors/MediaController.cs   |  9 ++++++++-
 Twice/Properties/AssemblyInfo.cs     |  4 ++--
 Twice/Resources/Texts/Changelog.json | 11 +++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Twice/Behaviors/MediaController.cs b/Twice/Behaviors/MediaController.cs
index c32e2be..4612a71 100644
--- 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
index d1ecdd1..466ef11 100644
--- 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" )]
\ No newline at end of file
diff --git a/Twice/Resources/Texts/Changelog.json b/Twice/Resources/Texts/Changelog.json
index ad42952..567f4f6 100644
--- 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",

From 76a43de8d0d20c73b3228a9d366b8d4824a6f9b2 Mon Sep 17 00:00:00 2001
From: Matthias Specht <sylence@btbsoft.org>
Date: Mon, 17 Oct 2016 19:35:31 +0200
Subject: [PATCH 2/2] Updated SourceMonitor project for release 0.8.1

---
 Twice.smproj | Bin 5012243 -> 5077118 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Twice.smproj b/Twice.smproj
index 7a7db9632cf8a3f73812969477b714988613ccd9..f8cde0c627fc80e94253345c8f4f5cfafdb2ecdf 100644
GIT binary patch
delta 358
zcmWm2NiIVH0D$559*<J98fs|GYO1QKHP7=_;v%-)SU7-4uTc@P=*ktG#LABNEWYH=
z|MdM5{eHbgwc9vMS3jaKmrB-yAczb3QobmH;4V(qtKnxN^ID6`KM$4ou@Z+wG|<TZ
zYoeJ1EwqxPjdnWdq>FBP=p{uT{R}WjnjwZ6VU!G6#u#UUNv4=)hFNmVG0y^vERkoK
s0xJ|*WsP+<*rY_6Ew<TVmp%45;E*GZIpLHu&bi={E3V%w@y+x7A0RVpRR910

delta 323
zcmWm6$u@#v007X_$8U}zLuD*VMP<x9WC&^5qx1|Oz>BbOtSovXD@(_<xZC^t{SjV&
z-oslriY>hKLyW)xgG3B5%m|~5G0p^WCYd5Zl4)j0G0PnD{Qqe(WLad1WmZ^ajU0K_
z*`Pp?O-huhu*Ei2YSh_bmp%45;E)DK9CN}cXPk4vC0AV2<c3@BxTnPfk37-l`LiE7
GU%fw9d3Iy~