diff options
| author |  Alexey Sokolov | 2015-11-02 20:03:10 +0000 |
|---|---|---|
| committer | Alexey Sokolov | 2015-11-02 20:03:10 +0000 |
| commit | 8b2f0ad1ca2473216114bde3455308fcf50f699e (patch) | |
| tree | 9aae4e969d735f1b94ddbb5b948028ccbbf70864 /src | |
| parent | shortcuts: Don't use backtab on windows (diff) | |
| parent | Fix invalid use of a pointer already freed (diff) | |
| download | KVIrc-8b2f0ad1ca2473216114bde3455308fcf50f699e.tar.gz KVIrc-8b2f0ad1ca2473216114bde3455308fcf50f699e.tar.bz2 KVIrc-8b2f0ad1ca2473216114bde3455308fcf50f699e.zip | |
Merge pull request #1711 from stakewinner00/master
Minor fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/ext/KviAnimatedPixmapCache.cpp | 3 | ||||
| -rw-r--r-- | src/modules/objects/KvsObject_pixmap.cpp | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.cpp b/src/kvilib/ext/KviAnimatedPixmapCache.cpp index 78af27744..ecb43cfed 100644 --- a/src/kvilib/ext/KviAnimatedPixmapCache.cpp +++ b/src/kvilib/ext/KviAnimatedPixmapCache.cpp @@ -255,10 +255,9 @@ void KviAnimatedPixmapCache::internalNotifyDelete( { i = m_timerData.erase(i); } else { - i++; + ++i; } } m_timerMutex.unlock(); } - diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp index f6846112a..23e1527ab 100644 --- a/src/modules/objects/KvsObject_pixmap.cpp +++ b/src/modules/objects/KvsObject_pixmap.cpp @@ -287,8 +287,8 @@ KVSO_CLASS_FUNCTION(pixmap,setPixel) c->error(__tr2qs_ctx("The pixmap is null","objects")); return false; } else if(m_currentType==Pixmap) { - if(m_pImage) - delete m_pImage; + delete m_pImage; + m_pImage = new QImage(); *m_pImage = m_pPixmap->toImage(); delete m_pPixmap; } @@ -317,9 +317,8 @@ KVSO_CLASS_FUNCTION(pixmap,pixel) } else if(m_currentType==Pixmap) { // qDebug("mpimage %i",m_pImage); // qDebug("pixmap %i %i",m_pPixmap->width(),m_pPixmap->height()); - if(m_pImage) - delete m_pImage; - else m_pImage = new QImage(); + delete m_pImage; + m_pImage = new QImage(); *m_pImage = m_pPixmap->toImage(); delete m_pPixmap; m_pPixmap = 0; |