Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-27 02:38:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11570 from jherico/overlays_blocking

Browse source 
Remove unnecessary blocking call
This commit is contained in:
Sam Gateau 2017-10-11 15:40:53 -07:00 committed by GitHub
commit 38b467a6bf
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/ui/overlays/Overlays.cpp
View file

@ -741,13 +741,6 @@ void Overlays::sendHoverLeaveOverlay(const OverlayID& id, const PointerEvent& ev
} }
OverlayID Overlays::getKeyboardFocusOverlay() { OverlayID Overlays::getKeyboardFocusOverlay() {
if (QThread::currentThread() != thread()) {
OverlayID result;
PROFILE_RANGE(script, __FUNCTION__);
BLOCKING_INVOKE_METHOD(this, "getKeyboardFocusOverlay", Q_RETURN_ARG(OverlayID, result));
return result;
}
return qApp->getKeyboardFocusOverlay(); return qApp->getKeyboardFocusOverlay();
} }