MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-11-08 21:24:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into new-ui

Browse Source
This commit is contained in:
Scott Lamb
2021-02-22 13:48:20 -08:00
parent c9cb5f2f01 d7eea63829
commit 9706dcaba1
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/json.rs
View File

@@ -440,7 +440,7 @@ pub struct Recording {
pub end_time_90k: i64,
pub sample_file_bytes: i64,
pub video_samples: i64,
pub video_sample_entry_id: String,
pub video_sample_entry_id: i32,
pub start_id: i32,
pub open_id: u32,

2
server/src/web.rs
View File

@@ -712,7 +712,7 @@ impl Service {
open_id: row.open_id,
first_uncommitted: row.first_uncommitted,
video_samples: row.video_samples,
video_sample_entry_id: row.video_sample_entry_id.to_string(),
video_sample_entry_id: row.video_sample_entry_id,
growing: row.growing,
});
if !out