From c5042cc364fea594d08902180373de3fe1f41ba5 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Thu, 13 Aug 2020 10:00:48 +0300
Subject: [PATCH] Catch all render exceptions
---
components/streams/src/renderers/openvr_render.cpp | 2 +-
components/streams/src/renderers/screen_render.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/streams/src/renderers/openvr_render.cpp b/components/streams/src/renderers/openvr_render.cpp
index 77902f3cd..a1b802edb 100644
--- a/components/streams/src/renderers/openvr_render.cpp
+++ b/components/streams/src/renderers/openvr_render.cpp
@@ -460,7 +460,7 @@ bool OpenVRRender::retrieve(ftl::data::Frame &frame_out) {
renderer_->end();
renderer2_->end();
- } catch (const ftl::exception &e) {
+ } catch (const std::exception &e) {
LOG(ERROR) << "Render exception: " << e.what();
renderer_->cancel();
renderer2_->cancel();
diff --git a/components/streams/src/renderers/screen_render.cpp b/components/streams/src/renderers/screen_render.cpp
index c4c6f11c5..3bd7d8c92 100644
--- a/components/streams/src/renderers/screen_render.cpp
+++ b/components/streams/src/renderers/screen_render.cpp
@@ -207,7 +207,7 @@ bool ScreenRender::retrieve(ftl::data::Frame &frame_out) {
// This waits for GPU also
if (!data_only) renderer_->end();
- } catch (const ftl::exception &e) {
+ } catch (const std::exception &e) {
LOG(ERROR) << "Render exception: " << e.what();
renderer_->cancel();
frame_out.message(ftl::data::Message::Error_RENDER, e.what());
--
GitLab