cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-12 19:03:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix merge

Browse Source
This commit is contained in:
arc-alex
2023-11-19 21:05:52 +01:00
parent c0f9521f86
commit 2dd872eb2d
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/utils/parser.ts
+1 -1
View File
@@ -276,7 +276,7 @@ export const parseJson = async (jsonData): Promise<DatabaseModel | null> => {
// Import OSC settings if any
returnData.osc = parseOsc(jsonData) ?? dbModel.osc;
// Import HTTP settings if any
returnData.http = parseHttp(jsonData, enforce);
returnData.http = parseHttp(jsonData) ?? dbModel.http;
return returnData as DatabaseModel;
};