diff options
| author | Rogier <rogier777@gmail.com> | 2015-12-23 11:38:50 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-12-30 00:08:56 +0100 |
| commit | c6bb6f99d1fc0acd0161307a17dd31eea4a56fff (patch) | |
| tree | 0cc80dae5fe1e3c88df9e8962dc44cb694d89e5d /src/database-sqlite3.h | |
| parent | 848b050a567e360e857577c50dee82494b14973b (diff) | |
| download | minetest-c6bb6f99d1fc0acd0161307a17dd31eea4a56fff.tar.gz minetest-c6bb6f99d1fc0acd0161307a17dd31eea4a56fff.tar.bz2 minetest-c6bb6f99d1fc0acd0161307a17dd31eea4a56fff.zip | |
Handle SQLITE_BUSY errors gracefully
This allows other applications (e.g. minetestmapper) to interrogate
the database while minetest is running, without causing an almost
certain minetest crash.
Diffstat (limited to 'src/database-sqlite3.h')
| -rw-r--r-- | src/database-sqlite3.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/database-sqlite3.h b/src/database-sqlite3.h index a775742be..04a1825d9 100644 --- a/src/database-sqlite3.h +++ b/src/database-sqlite3.h @@ -63,6 +63,10 @@ private: sqlite3_stmt *m_stmt_delete; sqlite3_stmt *m_stmt_begin; sqlite3_stmt *m_stmt_end; + + s64 m_busy_handler_data[2]; + + static int busyHandler(void *data, int count); }; #endif |