You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
977 B
33 lines
977 B
--- a/service/SettingsConfuse.cpp
|
|
+++ b/service/SettingsConfuse.cpp
|
|
@@ -42,10 +42,10 @@ Settings::Settings(void) {
|
|
*/
|
|
Settings::~Settings(void) {
|
|
TelldusCore::MutexLocker locker(&mutex);
|
|
- if (d->cfg > 0) {
|
|
+ if (d->cfg) {
|
|
cfg_free(d->cfg);
|
|
}
|
|
- if (d->var_cfg > 0) {
|
|
+ if (d->var_cfg) {
|
|
cfg_free(d->var_cfg);
|
|
}
|
|
delete d;
|
|
@@ -56,7 +56,7 @@ Settings::~Settings(void) {
|
|
*/
|
|
std::wstring Settings::getSetting(const std::wstring &strName) const {
|
|
TelldusCore::MutexLocker locker(&mutex);
|
|
- if (d->cfg > 0) {
|
|
+ if (d->cfg) {
|
|
std::string setting(cfg_getstr(d->cfg, TelldusCore::wideToString(strName).c_str()));
|
|
return TelldusCore::charToWstring(setting.c_str());
|
|
}
|
|
@@ -68,7 +68,7 @@ std::wstring Settings::getSetting(const
|
|
*/
|
|
int Settings::getNumberOfNodes(Node node) const {
|
|
TelldusCore::MutexLocker locker(&mutex);
|
|
- if (d->cfg > 0) {
|
|
+ if (d->cfg) {
|
|
if (node == Device) {
|
|
return cfg_size(d->cfg, "device");
|
|
} else if (node == Controller) {
|