1 files changed, 1 insertions, 4 deletions
diff --git a/src/filemanager.cpp b/src/filemanager.cpp
index 29e85fbc..db0aa2ee 100644
--- a/src/filemanager.cpp
+++ b/src/filemanager.cpp
@@ -1627,10 +1627,7 @@ static void *pj_open_file_with_manager(projCtx ctx, const char *name,
 
 static NS_PROJ::io::DatabaseContextPtr getDBcontext(PJ_CONTEXT *ctx) {
     try {
-        if (ctx->cpp_context == nullptr) {
-            ctx->cpp_context = new projCppContext(ctx);
-        }
-        return ctx->cpp_context->getDatabaseContext().as_nullable();
+        return ctx->get_cpp_context()->getDatabaseContext().as_nullable();
     } catch (const std::exception &e) {
         pj_log(ctx, PJ_LOG_DEBUG, "%s", e.what());
         return nullptr;