From 1f25b5657921f31999c2717f5d34ace4d74ae07a Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Sun, 15 Dec 2019 10:37:57 +0100 Subject: [PATCH] gs-effect-technique: Return nullptr instead of throwing exception --- source/obs/gs/gs-effect-technique.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/obs/gs/gs-effect-technique.cpp b/source/obs/gs/gs-effect-technique.cpp index c25c31d9..5ecc570e 100644 --- a/source/obs/gs/gs-effect-technique.cpp +++ b/source/obs/gs/gs-effect-technique.cpp @@ -23,7 +23,8 @@ #include -gs::effect_technique::effect_technique(gs_technique_t* technique, std::shared_ptr* parent) : _parent(parent) +gs::effect_technique::effect_technique(gs_technique_t* technique, std::shared_ptr* parent) + : _parent(parent) { reset(technique, [](void*) {}); } @@ -32,7 +33,6 @@ gs::effect_technique::~effect_technique() {} std::string gs::effect_technique::name() { - return std::string(get()->name, get()->name + strnlen_s(get()->name, 256)); } @@ -44,7 +44,7 @@ size_t gs::effect_technique::count_passes() gs::effect_pass gs::effect_technique::get_pass(size_t idx) { if (idx >= get()->passes.num) { - throw std::out_of_range("Index is out of range."); + return nullptr; } return gs::effect_pass(get()->passes.array + idx, this); @@ -58,7 +58,7 @@ gs::effect_pass gs::effect_technique::get_pass(std::string name) return gs::effect_pass(ptr, this); } - throw std::invalid_argument("Pass with given name does not exist."); + return nullptr; } bool gs::effect_technique::has_pass(std::string name)