From 2425baf6e698c6c91eeae15a8aba0238e2c9ea1c Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 24 Apr 2016 08:14:56 -0700 Subject: [PATCH 1/4] don't early _exit on Linux --- interface/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 4b6d50c274..bf1fe1d922 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -203,7 +203,7 @@ int main(int argc, const char* argv[]) { Application::shutdownPlugins(); qCDebug(interfaceapp, "Normal exit."); -#ifndef DEBUG +#if defined(DEBUG) && !defined(Q_OS_LINUX) // HACK: exit immediately (don't handle shutdown callbacks) for Release build _exit(exitCode); #endif From c9df4468794a462f993c8ccfe40f3567df0fcdea Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 24 Apr 2016 08:15:10 -0700 Subject: [PATCH 2/4] web-entities don't yet work right on Linux --- libraries/entities-renderer/src/RenderableWebEntityItem.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp index 855fd16408..9edcd8259c 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp @@ -51,6 +51,11 @@ RenderableWebEntityItem::~RenderableWebEntityItem() { } bool RenderableWebEntityItem::buildWebSurface(EntityTreeRenderer* renderer) { + #ifdef defined(Q_OS_LINUX) + // these don't seem to work on Linux + return false; + #endif + if (_currentWebCount >= MAX_CONCURRENT_WEB_VIEWS) { qWarning() << "Too many concurrent web views to create new view"; return false; From cb523a3a715ce41f55aaabc889bf8f786e8bec9a Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 5 May 2016 16:01:05 -0700 Subject: [PATCH 3/4] disable webSurface differently --- .../entities-renderer/src/RenderableWebEntityItem.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp index ca3f694fd7..891e1dca3b 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp @@ -51,11 +51,6 @@ RenderableWebEntityItem::~RenderableWebEntityItem() { } bool RenderableWebEntityItem::buildWebSurface(EntityTreeRenderer* renderer) { - #ifdef defined(Q_OS_LINUX) - // these don't seem to work on Linux - return false; - #endif - if (_currentWebCount >= MAX_CONCURRENT_WEB_VIEWS) { qWarning() << "Too many concurrent web views to create new view"; return false; @@ -179,9 +174,14 @@ void RenderableWebEntityItem::render(RenderArgs* args) { #endif if (!_webSurface) { + #if defined(Q_OS_LINUX) + // these don't seem to work on Linux + return; + #else if (!buildWebSurface(static_cast(args->_renderer))) { return; } + #endif } _lastRenderTime = usecTimestampNow(); From f8f86a0d451b991846dc3796398d36799df06e1d Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 7 May 2016 11:05:38 -0700 Subject: [PATCH 4/4] only _exit if not DEBUG --- interface/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index bf1fe1d922..1726d47045 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -203,7 +203,7 @@ int main(int argc, const char* argv[]) { Application::shutdownPlugins(); qCDebug(interfaceapp, "Normal exit."); -#if defined(DEBUG) && !defined(Q_OS_LINUX) +#if !defined(DEBUG) && !defined(Q_OS_LINUX) // HACK: exit immediately (don't handle shutdown callbacks) for Release build _exit(exitCode); #endif