salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Any drive settings in the global config will override loaded settings from an

Browse Source 
fl2 file.
This commit is contained in:
dg
2023-05-11 19:21:59 +00:00
parent d84c366480
commit 9e383575d1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/fluxsource/fl2fluxsource.cc
View File

@@ -37,10 +37,9 @@ public:
{
_proto = loadFl2File(_config.filename());
if (::globalConfig()->has_drive())
warning(
"FLUX: overriding drive configuration with flux file contents");
::globalConfig()->mutable_drive()->MergeFrom(_proto.drive());
DriveProto d = _proto.drive();
d.MergeFrom(globalConfig()->drive());
*(globalConfig()->mutable_drive()) = d;
}
public: