From 20b82b3638d15f4812e0b4c81583e1ebba4fd57b Mon Sep 17 00:00:00 2001
From: jikstra <jikstra@disroot.org>
Date: Wed, 25 Sep 2019 04:13:44 +0200
Subject: [PATCH] Fix ffi actually calling context.sql.is_open()

---
 deltachat-ffi/src/lib.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs
index 9e9834732..fbd94a7ef 100644
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -275,12 +275,10 @@ pub unsafe extern "C" fn dc_is_open(context: *mut dc_context_t) -> libc::c_int {
         eprintln!("ignoring careless call to dc_is_open()");
         return 0;
     }
-    let ffi_context = &mut *context;
-    let inner_guard = ffi_context.inner.read().unwrap();
-    match *inner_guard {
-        Some(_) => 0,
-        None => 1,
-    }
+    let ffi_context = &*context;
+    ffi_context
+        .with_inner(|ctx| ctx.sql.is_open() as libc::c_int)
+        .unwrap_or(0)
 }
 
 #[no_mangle]