Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:25:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7825 from sethalves/linux-qol

Browse source 
Linux qol
This commit is contained in:
Andrew Meadows 2016-05-09 15:34:10 -07:00
commit 59c6a6dfea
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/main.cpp
View file

@ -203,7 +203,7 @@ int main(int argc, const char* argv[]) {
Application::shutdownPlugins(); Application::shutdownPlugins();
qCDebug(interfaceapp, "Normal exit."); qCDebug(interfaceapp, "Normal exit.");
#ifndef DEBUG #if !defined(DEBUG) && !defined(Q_OS_LINUX)
// HACK: exit immediately (don't handle shutdown callbacks) for Release build // HACK: exit immediately (don't handle shutdown callbacks) for Release build
_exit(exitCode); _exit(exitCode);
#endif #endif

5
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
View file

@ -174,9 +174,14 @@ void RenderableWebEntityItem::render(RenderArgs* args) {
#endif #endif
if (!_webSurface) { if (!_webSurface) {
#if defined(Q_OS_LINUX)
// these don't seem to work on Linux
return;
#else
if (!buildWebSurface(static_cast<EntityTreeRenderer*>(args->_renderer))) { if (!buildWebSurface(static_cast<EntityTreeRenderer*>(args->_renderer))) {
return; return;
} }
#endif
} }
_lastRenderTime = usecTimestampNow(); _lastRenderTime = usecTimestampNow();