Superminaren
/
sample-hive
mirror of https://gitlab.com/samplehive/sample-hive.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed SQLITE_BUSY Bug 

Database::HasSample failed to close database when sample found.
This commit is contained in:
mill-j 2021-04-25 12:41:22 -05:00
parent 520a2a352b
commit a411e28c18
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Database.cpp
View File

@ -116,7 +116,7 @@ void Database::InsertSample(int favorite, std::string filename,
if (rc != SQLITE_DONE) if (rc != SQLITE_DONE)
{ {
wxLogDebug("No data inserted. Error code: %d", rc); wxLogDebug("No data inserted. Error code: %d: Msg: %s", rc , sqlite3_errmsg(m_Database));
} }
rc = sqlite3_finalize(m_Stmt); rc = sqlite3_finalize(m_Stmt);
@ -127,7 +127,7 @@ void Database::InsertSample(int favorite, std::string filename,
// "Error! Cannot insert data into table.", // "Error! Cannot insert data into table.",
// "Error", wxOK | wxICON_ERROR); // "Error", wxOK | wxICON_ERROR);
// msgDialog.ShowModal(); // msgDialog.ShowModal();
wxLogDebug("Error! Cannot insert data into table. Error code: %d", rc); wxLogDebug("Error! Cannot insert data into table. Error code: %d: Msg: %s", rc , sqlite3_errmsg(m_Database));
} }
else else
{ {
@ -746,6 +746,7 @@ wxVector<wxVector<wxVariant>> Database::FilterDatabaseBySampleName(wxVector<wxVe
bool Database::HasSample(std::string filename) bool Database::HasSample(std::string filename)
{ {
std::string sample; std::string sample;
bool haveSample = false;
try try
{ {
rc = sqlite3_open("sample.hive", &m_Database); rc = sqlite3_open("sample.hive", &m_Database);
@ -760,7 +761,7 @@ bool Database::HasSample(std::string filename)
{ {
wxLogInfo("Record found, fetching.."); wxLogInfo("Record found, fetching..");
sample = std::string(reinterpret_cast< const char* >(sqlite3_column_text(m_Stmt, 0))); sample = std::string(reinterpret_cast< const char* >(sqlite3_column_text(m_Stmt, 0)));
return true; haveSample = true;
} }
rc = sqlite3_finalize(m_Stmt); rc = sqlite3_finalize(m_Stmt);
@ -778,6 +779,8 @@ bool Database::HasSample(std::string filename)
} }
sqlite3_close(m_Database); sqlite3_close(m_Database);
return haveSample;
} }
catch (const std::exception &exception) catch (const std::exception &exception)
{ {