From ccad2d924a38fcdeda450775ee45af4144e3261a Mon Sep 17 00:00:00 2001
From: lay295 <fizzohd@gmail.com>
Date: Tue, 3 Mar 2020 11:46:25 -0500
Subject: [PATCH] Show highlighted messages

---
 TwitchDownloaderWPF/PageChatRender.xaml.cs  | 7 +++++--
 TwitchDownloaderWPF/PageVodDownload.xaml.cs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/TwitchDownloaderWPF/PageChatRender.xaml.cs b/TwitchDownloaderWPF/PageChatRender.xaml.cs
index 4d12b20d..0755c934 100644
--- a/TwitchDownloaderWPF/PageChatRender.xaml.cs
+++ b/TwitchDownloaderWPF/PageChatRender.xaml.cs
@@ -142,8 +142,11 @@ private void BackgroundRenderManager_DoWork(object sender, DoWorkEventArgs e)
             {
                 if (comment.source != "chat")
                     continue;
-                if (comment.message.user_notice_params != null && (comment.message.user_notice_params.msg_id != null && comment.message.user_notice_params.msg_id != ""))
-                    continue;
+                if (comment.message.user_notice_params != null && comment.message.user_notice_params.msg_id != null)
+                {
+                    if (comment.message.user_notice_params.msg_id != "highlighted-message" && comment.message.user_notice_params.msg_id != "")
+                        continue;
+                }
 
                 string userName = comment.commenter.display_name.ToString();
                 int default_x = 2;
diff --git a/TwitchDownloaderWPF/PageVodDownload.xaml.cs b/TwitchDownloaderWPF/PageVodDownload.xaml.cs
index 09b2d4a0..8ef28222 100644
--- a/TwitchDownloaderWPF/PageVodDownload.xaml.cs
+++ b/TwitchDownloaderWPF/PageVodDownload.xaml.cs
@@ -285,7 +285,7 @@ private void BackgroundDownloadManager_DoWork(object sender, DoWorkEventArgs e)
             Task.WaitAll(info);
             double seekTime = options.crop_begin;
             double seekDuration = info.Result.Duration.TotalSeconds - seekTime - options.crop_end;
-            Task<IConversionResult> conversionResult = Conversion.New().Start(String.Format("-y -i \"{0}\" -ss {1} -analyzeduration {2} -t {3} -acodec copy -vcodec copy \"{4}\"", Path.Combine(downloadFolder, "output.ts"), seekTime.ToString(), int.MaxValue, seekDuration.ToString(), outputConvert));
+            Task<IConversionResult> conversionResult = Conversion.New().Start(String.Format("-y -i \"{0}\" -ss {1} -analyzeduration {2} -t {3} -avoid_negative_ts make_zero -vcodec copy \"{4}\"", Path.Combine(downloadFolder, "output.ts"), seekTime.ToString(), int.MaxValue, seekDuration.ToString(), outputConvert));
             Task.WaitAll(conversionResult);
             if (Directory.Exists(downloadFolder))
                 DeleteDirectory(downloadFolder);