From 876f70709ee1e349fb65212e09dd2e42238dc67e Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Mon, 17 Oct 2016 11:57:32 -0700 Subject: [PATCH] change oculus init errors to critical --- plugins/oculus/src/OculusDisplayPlugin.cpp | 4 ++-- plugins/oculus/src/OculusHelpers.cpp | 4 ++-- plugins/oculus/src/OculusHelpers.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp index 4f12e71d13..415965e948 100644 --- a/plugins/oculus/src/OculusDisplayPlugin.cpp +++ b/plugins/oculus/src/OculusDisplayPlugin.cpp @@ -59,14 +59,14 @@ void OculusDisplayPlugin::customizeContext() { ovrResult result = ovr_CreateTextureSwapChainGL(_session, &desc, &_textureSwapChain); if (!OVR_SUCCESS(result)) { - logFatal("Failed to create swap textures"); + logCritical("Failed to create swap textures"); return; } int length = 0; result = ovr_GetTextureSwapChainLength(_session, _textureSwapChain, &length); if (!OVR_SUCCESS(result) || !length) { - logFatal("Unable to count swap chain textures"); + logCritical("Unable to count swap chain textures"); return; } for (int i = 0; i < length; ++i) { diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp index 80390fd538..5fbc0db7d1 100644 --- a/plugins/oculus/src/OculusHelpers.cpp +++ b/plugins/oculus/src/OculusHelpers.cpp @@ -39,12 +39,12 @@ void logWarning(const char* what) { qWarning(oculus) << what << ":" << getError().ErrorString; } -void logFatal(const char* what) { +void logCritical(const char* what) { std::string error("[oculus] "); error += what; error += ": "; error += getError().ErrorString; - qFatal(error.c_str()); + qCritical(error.c_str()); } diff --git a/plugins/oculus/src/OculusHelpers.h b/plugins/oculus/src/OculusHelpers.h index ba0547ae0a..e55dde1034 100644 --- a/plugins/oculus/src/OculusHelpers.h +++ b/plugins/oculus/src/OculusHelpers.h @@ -15,7 +15,7 @@ #include void logWarning(const char* what); -void logFatal(const char* what); +void logCritical(const char* what); bool oculusAvailable(); ovrSession acquireOculusSession(); void releaseOculusSession();