Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15494 from amerhifi/amdCursorbug

Browse source 
case 22438: setting default cursor after display initialization for systems that …
This commit is contained in:
Sam Gateau 2019-05-02 08:50:19 -07:00 committed by GitHub
commit 06dc9fc39f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -1330,7 +1330,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
setCrashAnnotation("avatar", avatarURL.toString().toStdString());
});
// Inititalize sample before registering
_sampleSound = DependencyManager::get<SoundCache>()->getSound(PathUtils::resourcesUrl("sounds/sample.wav"));
@ -1421,6 +1420,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
initializeDisplayPlugins();
qCDebug(interfaceapp, "Initialized Display");
if (_displayPlugin && !_displayPlugin->isHmd()) {
_preferredCursor.set(Cursor::Manager::getIconName(Cursor::Icon::SYSTEM));
showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
}
// An audio device changed signal received before the display plugins are set up will cause a crash,
// so we defer the setup of the `scripting::Audio` class until this point
{