sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Make a blank settings interface if one does not exist because segfaulting is bad

Browse Source
This commit is contained in:
Paul Hollinsky
2018-10-22 17:23:13 -04:00
parent 6456d4e261
commit 8044488bed
5 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/idevicesettings.cpp
+7 -4
View File
@@ -43,6 +43,9 @@ uint16_t IDeviceSettings::CalculateGSChecksum(const std::vector<uint8_t>& settin
}
bool IDeviceSettings::refresh(bool ignoreChecksum) {
if(disabled)
return false;
std::vector<uint8_t> rxSettings;
bool ret = com->getSettingsSync(rxSettings);
if(!ret)
@@ -86,7 +89,7 @@ bool IDeviceSettings::refresh(bool ignoreChecksum) {
}
bool IDeviceSettings::apply(bool temporary) {
if(readonly)
if(disabled || readonly)
return false;
std::vector<uint8_t> bytestream;
@@ -135,7 +138,7 @@ bool IDeviceSettings::apply(bool temporary) {
}
bool IDeviceSettings::applyDefaults(bool temporary) {
if(readonly)
if(disabled || readonly)
return false;
com->sendCommand(Command::SetDefaultSettings);
@@ -178,7 +181,7 @@ bool IDeviceSettings::applyDefaults(bool temporary) {
}
bool IDeviceSettings::setBaudrateFor(Network net, uint32_t baudrate) {
if(readonly)
if(disabled || readonly)
return false;
switch(net.getType()) {
@@ -201,7 +204,7 @@ bool IDeviceSettings::setBaudrateFor(Network net, uint32_t baudrate) {
}
template<typename T> bool IDeviceSettings::setStructure(const T& newStructure) {
if(readonly)
if(disabled || readonly)
return false;
if(sizeof(T) != structSize)