Skip to content

Commit e1908de

Browse files
meedstromtarsius
authored andcommitted
emacsql-close: Only close if still open
Fix intermittent "wrong type argument: sqlitep nil". Closes #132.
1 parent 138fae5 commit e1908de

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

emacsql-sqlite-builtin.el

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ buffer. This is for debugging purposes."
4949
(and (oref connection handle) t))
5050

5151
(cl-defmethod emacsql-close ((connection emacsql-sqlite-builtin-connection))
52-
(sqlite-close (oref connection handle))
53-
(oset connection handle nil))
52+
(when (oref connection handle)
53+
(sqlite-close (oref connection handle))
54+
(oset connection handle nil)))
5455

5556
(cl-defmethod emacsql-send-message
5657
((connection emacsql-sqlite-builtin-connection) message)

emacsql-sqlite-module.el

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ buffer. This is for debugging purposes."
5555
(and (oref connection handle) t))
5656

5757
(cl-defmethod emacsql-close ((connection emacsql-sqlite-module-connection))
58-
(sqlite3-close (oref connection handle))
59-
(oset connection handle nil))
58+
(when (oref connection handle)
59+
(sqlite3-close (oref connection handle))
60+
(oset connection handle nil)))
6061

6162
(cl-defmethod emacsql-send-message
6263
((connection emacsql-sqlite-module-connection) message)

0 commit comments

Comments
 (0)