From 8c41cfc3a714c532183a0c3542f86609ea1bc8ac Mon Sep 17 00:00:00 2001
From: snowman2 <alansnow21@gmail.com>
Date: Sun, 16 Aug 2020 19:40:00 -0500
Subject: Add methods to ensure safer interactions with cpp_context

---
 src/filemanager.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/filemanager.cpp')

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;
-- 
cgit v1.2.3