History

Merge branch master into protocol_changes

HifiExperiments committed 2 years ago

Commit ee705d21 parent f9e729b370 files · +11827 −6045Browse files

Showing the changes to interface/src/scripting/SettingsScriptingInterface.cpp (1 of 370 files). Show all

Unified · Split

interface/src/scripting/SettingsScriptingInterface.cpp+7−1
@@ -21,6 +21,9 @@ SettingsScriptingInterface* SettingsScriptingInterface::getInstance() { · 20 unmodified lines
2121 }
2222
2323 QVariant SettingsScriptingInterface::getValue(const QString& setting) {
24+ if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
25+ return {""};
26+ }
2427 QVariant value = Setting::Handle<QVariant>(setting).get();
2528 if (!value.isValid()) {
2629 value = "";
@@ -29,6 +32,9 @@ QVariant SettingsScriptingInterface::getValue(const QString& setting) { · 2 unmodified lines
2932 }
3033
3134 QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVariant& defaultValue) {
35+ if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
36+ return {""};
37+ }
3238 QVariant value = Setting::Handle<QVariant>(setting, defaultValue).get();
3339 if (!value.isValid()) {
3440 value = "";
@@ -40,7 +46,7 @@ void SettingsScriptingInterface::setValue(const QString& setting, const QVariant · 5 unmodified lines
4046 if (getValue(setting) == value) {
4147 return;
4248 }
43− if (setting.startsWith("private/")) {
49+ if (setting.startsWith("private/") || setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
4450 if (_restrictPrivateValues) {
4551 qWarning() << "SettingsScriptingInterface::setValue -- restricted write: " << setting << value;
4652 return;