Fix context error handler

This can be called deep in the gphoto2 callstack, and throwing here would prevent proper C cleanup.

Instead, just log an error here and rely on status values higher up in the APIs to throw actual C++ errors.
This commit is contained in:
Ingvar Stepanyan
2021-07-23 19:22:34 +00:00
parent fc52ce5c84
commit 86f9be758f

View File

@@ -20,8 +20,8 @@ void gpp_try(int status) {
} }
} }
void gpp_error(GPContext *context, const char *text, void *data) { void gpp_log_error(GPContext *context, const char *text, void *data) {
throw std::runtime_error(text); std::cerr << text << std::endl;
} }
#define GPP_CALL(RET, EXPR) \ #define GPP_CALL(RET, EXPR) \
@@ -55,7 +55,7 @@ class Context {
gpp_rethrow([=]() { gpp_rethrow([=]() {
camera.reset(GPP_CALL(Camera *, gp_camera_new(_))); camera.reset(GPP_CALL(Camera *, gp_camera_new(_)));
context.reset(gp_context_new()); context.reset(gp_context_new());
gp_context_set_error_func(context.get(), gpp_error, nullptr); gp_context_set_error_func(context.get(), gpp_log_error, nullptr);
gpp_try(gp_camera_init(camera.get(), context.get())); gpp_try(gp_camera_init(camera.get(), context.get()));
}); });
} }