jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent profiles loaded on startup from being overwritten

Browse source
This commit is contained in:
Chris 2020-12-27 23:42:45 +11:00 • committed by Adam Honse
parent 16cc5ce6d4
commit 8492a8c76e
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cli.cpp
View file

@ -53,15 +53,17 @@ struct ServerOptions
struct Options struct Options
{ {
std::vector<DeviceOptions> devices; std::vector<DeviceOptions> devices;
/*---------------------------------------------------------*\ /*---------------------------------------------------------*\
| If hasDevice is false, devices above is empty and | | If hasDevice is false, devices above is empty and |
| allDeviceOptions shall be applied to all available devices| | allDeviceOptions shall be applied to all available devices|
| except in the case that a profile was loaded. |
\*---------------------------------------------------------*/ \*---------------------------------------------------------*/
bool hasDevice; bool hasDevice;
DeviceOptions allDeviceOptions; bool profile_loaded;
ServerOptions servOpts; DeviceOptions allDeviceOptions;
ServerOptions servOpts;
}; };
@ -774,7 +776,7 @@ int ProcessOptions(int argc, char *argv[], Options *options, std::vector<RGBCont
\*---------------------------------------------------------*/ \*---------------------------------------------------------*/
else if(option == "--profile" || option == "-p") else if(option == "--profile" || option == "-p")
{ {
OptionProfile(argument, rgb_controllers); options->profile_loaded = OptionProfile(argument, rgb_controllers);
arg_index++; arg_index++;
} }
@ -1207,7 +1209,7 @@ unsigned int cli_post_detection(int argc, char *argv[])
ApplyOptions(options.devices[device_idx], rgb_controllers); ApplyOptions(options.devices[device_idx], rgb_controllers);
} }
} }
else else if (!options.profile_loaded)
{ {
for (unsigned int device_idx = 0; device_idx < rgb_controllers.size(); device_idx++) for (unsigned int device_idx = 0; device_idx < rgb_controllers.size(); device_idx++)
{ {