gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/3956d7e5 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e680a87a (commit)
	from  https://github.com/Gnucash/gnucash/commit/1520c311 (commit)



commit 3956d7e52f8e1eacc57d10b6a20d92f95d214f7c
Merge: 1520c311d9 e680a87a66
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Oct 30 10:26:33 2025 -0700

    Merge Sherlock's 'patch-1' into stable.


commit e680a87a66b8ec17132f186e222cbc94ad52b3d0
Author: Sherlock <119709043+agwekixj at users.noreply.github.com>
Date:   Wed Oct 29 20:32:50 2025 -0700

    Bug 799682 - Unable to "Save As" (or open) a non-xml data file
    
    Fixes a generic bug in gnc_module_init_backend_dbi() when HAVE_LIBDBI_R is defined.  Specifically, when the initial dbi_initialize_r() returns no drivers, the dbi_instance variable is still set.

diff --git a/libgnucash/backend/dbi/gnc-backend-dbi.cpp b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
index e95f5efe48..15b5935148 100644
--- a/libgnucash/backend/dbi/gnc-backend-dbi.cpp
+++ b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
@@ -1096,7 +1096,10 @@ gnc_module_init_backend_dbi (void)
     {
 #if HAVE_LIBDBI_R
         if (dbi_instance)
-            return;
+        {
+            dbi_shutdown_r (dbi_instance);
+            dbi_instance = nullptr;
+        }
 #endif
         gchar *libdir = gnc_path_get_libdir ();
         gchar *dir = g_build_filename (libdir, "dbd", nullptr);



Summary of changes:
 libgnucash/backend/dbi/gnc-backend-dbi.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)