Commit 215e58a6 by Carwyn

1. 清理历史交易数据库时,可能会在线程中抛异常问题

parent 451f4ce6
...@@ -9,7 +9,12 @@ ...@@ -9,7 +9,12 @@
FMPDataBase::FMPDataBase(QString dbname, QString connectname, QObject *parent) : QObject(parent) FMPDataBase::FMPDataBase(QString dbname, QString connectname, QObject *parent) : QObject(parent)
{ {
_db = QSqlDatabase::addDatabase("QSQLITE", connectname); if (QSqlDatabase::contains(connectname)) {
_db = QSqlDatabase::addDatabase("QSQLITE", connectname);
}
else {
_db = QSqlDatabase::database(connectname);
}
_db.setDatabaseName(dbname); _db.setDatabaseName(dbname);
_isopen = _db.open(); _isopen = _db.open();
} }
......
...@@ -197,10 +197,10 @@ void FMPePayPrivate::Init() ...@@ -197,10 +197,10 @@ void FMPePayPrivate::Init()
void FMPePayPrivate::clearorder() void FMPePayPrivate::clearorder()
{ {
Q_Q(FMPePay); QtConcurrent::run( [&, this]()
QtConcurrent::run( [q, this]()
{ {
Q_Q(FMPePay);
FMPDataBase db(q->_databasename, QString("fmp_pay_clean")) ; FMPDataBase db(q->_databasename, QString("fmp_pay_clean")) ;
QDateTime date = QDateTime::currentDateTime(); QDateTime date = QDateTime::currentDateTime();
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 14 #define VER_BUILD 16
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment