Commit 4a632a60 authored by Pietro Cerutti's avatar Pietro Cerutti Committed by Jan-Erik Rediger
Browse files

Make sure to disconnect the adapter in the destructor

parent 9069b147
...@@ -72,9 +72,16 @@ class RedisQtAdapter : public QObject { ...@@ -72,9 +72,16 @@ class RedisQtAdapter : public QObject {
RedisQtAdapter(QObject * parent = 0) RedisQtAdapter(QObject * parent = 0)
: QObject(parent), m_ctx(0), m_read(0), m_write(0) { } : QObject(parent), m_ctx(0), m_read(0), m_write(0) { }
~RedisQtAdapter() { } ~RedisQtAdapter() {
if (m_ctx != 0) {
m_ctx->ev.data = NULL;
}
}
void setContext(redisAsyncContext * ac) { int setContext(redisAsyncContext * ac) {
if (ac->ev.data != NULL) {
return REDIS_ERR;
}
m_ctx = ac; m_ctx = ac;
m_ctx->ev.data = this; m_ctx->ev.data = this;
m_ctx->ev.addRead = RedisQtAddRead; m_ctx->ev.addRead = RedisQtAddRead;
...@@ -82,6 +89,7 @@ class RedisQtAdapter : public QObject { ...@@ -82,6 +89,7 @@ class RedisQtAdapter : public QObject {
m_ctx->ev.addWrite = RedisQtAddWrite; m_ctx->ev.addWrite = RedisQtAddWrite;
m_ctx->ev.delWrite = RedisQtDelWrite; m_ctx->ev.delWrite = RedisQtDelWrite;
m_ctx->ev.cleanup = RedisQtCleanup; m_ctx->ev.cleanup = RedisQtCleanup;
return REDIS_OK;
} }
private: private:
......
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