History

Merge branch 'master' of https://github.com/highfidelity/hifi into lobby

Stephen Birarda committed 12 years ago

Commit cb7a6cb2 parents e2536dd b506a9930 files · +813 −113Browse files

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

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+1−4
@@ -228,10 +228,7 @@ bool ControllerScriptingInterface::isKeyCaptured(QKeyEvent* event) const { · 227 unmodified lines
228228
229229 bool ControllerScriptingInterface::isKeyCaptured(const KeyEvent& event) const {
230230 // if we've captured some combination of this key it will be in the map
231− if (_capturedKeys.contains(event.key, event)) {
232− return true;
233− }
234− return false;
231+ return _capturedKeys.contains(event.key, event);
235232 }
236233
237234 void ControllerScriptingInterface::captureKeyEvents(const KeyEvent& event) {