History

Merge branch 'master' into M19768

# Conflicts: # interface/src/scripting/HMDScriptingInterface.h

David Rowe committed 8 years ago

Commit c9b3fda2 parents 371919b 3fabe55165 files · +4553 −159Browse files

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

Unified · Split

interface/src/scripting/HMDScriptingInterface.cpp+5−2
@@ -122,8 +122,11 @@ void HMDScriptingInterface::toggleShouldShowTablet() { · 121 unmodified lines
122122 }
123123
124124 void HMDScriptingInterface::setShouldShowTablet(bool value) {
125− _showTablet = value;
126− _tabletContextualMode = false;
125+ if (_showTablet != value) {
126+ _showTablet = value;
127+ _tabletContextualMode = false;
128+ emit showTabletChanged(value);
129+ }
127130 }
128131
129132 void HMDScriptingInterface::setMiniTabletEnabled(bool enabled) {