Austin/BililiveRecorder
1
0
Fork 0
mirror of https://github.com/BililiveRecorder/BililiveRecorder.git synced 2024-11-16 19:57:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #52 from Bililive/dev

Browse Source 
Release 1.1.10
This commit is contained in:
Genteure 2019-06-04 15:47:22 +08:00 committed by GitHub
commit 70f1f1a4a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BililiveRecorder.Core/RecordedRoom.cs
View File

@ -77,6 +77,7 @@ namespace BililiveRecorder.Core
private HttpResponseMessage _response;
private Stream _stream;
private Task StartupTask = null;
private readonly object StartupTaskLock = new object();
public Task StreamDownloadTask = null;
public CancellationTokenSource cancellationTokenSource = null;
@ -148,10 +149,12 @@ namespace BililiveRecorder.Core
private void StreamMonitor_StreamStatusChanged(object sender, StreamStatusChangedArgs e)
{
// if (StartupTask?.IsCompleted ?? true)
if (!IsRecording && (StartupTask?.IsCompleted ?? true))
lock (StartupTaskLock)
{
StartupTask = _StartRecordAsync();
if (!IsRecording && (StartupTask?.IsCompleted ?? true))
{
StartupTask = _StartRecordAsync();
}
}
}

7
BililiveRecorder.FlvProcessor/FlvStreamProcessor.cs
View File

@ -88,8 +88,6 @@ namespace BililiveRecorder.FlvProcessor
EnabledFeature = enabledFeature;
CuttingMode = autoCuttingMode;
if (EnabledFeature.IsRecordEnabled()) { OpenNewRecordFile(); }
return this;
}
@ -271,6 +269,11 @@ namespace BililiveRecorder.FlvProcessor
}
}
if (!(_targetFile?.CanWrite ?? false))
{
OpenNewRecordFile();
}
tag.WriteTo(_targetFile, _writeTimeStamp);
}
void ProcessClipLogic()

1
BililiveRecorder.WPF/MainWindow.xaml.cs
View File

@ -35,6 +35,7 @@ namespace BililiveRecorder.WPF
{
"当前版本：" + BuildInfo.Version,
"网站： https://rec.danmuji.org",
"更新日志： https://rec.danmuji.org/allposts",
"QQ群： 689636812",
"",
"【公告】问卷调查",

2
VERSION
View File

@ -1 +1 @@
1.1.9
1.1.10