X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcolorpickerwidget.cpp;h=acd1d26982a8be5378c146f2395f5582abaa6b66;hb=d5b4fe2e78d8b2645cdc2ac007c1006a151875c0;hp=1fb6bfc870c6e61d9804b692ad9aa25314c1535e;hpb=a82651afd1151b90777f8be082368c39f3d3bc5a;p=kdenlive

diff --git a/src/colorpickerwidget.cpp b/src/colorpickerwidget.cpp
index 1fb6bfc8..acd1d269 100644
--- a/src/colorpickerwidget.cpp
+++ b/src/colorpickerwidget.cpp
@@ -59,6 +59,7 @@ ColorPickerWidget::ColorPickerWidget(QWidget *parent) :
 {
 #ifdef Q_WS_X11
     m_filter = 0;
+    m_image = NULL;
 #endif
 
     QHBoxLayout *layout = new QHBoxLayout(this);
@@ -140,6 +141,7 @@ QColor ColorPickerWidget::averagePickedColor(const QPoint pos)
 
 #ifdef Q_WS_X11
     XDestroyImage(m_image);
+    m_image = NULL;
 #endif
 
     if (size > 200)
@@ -222,7 +224,7 @@ QColor ColorPickerWidget::grabColor(const QPoint &p, bool destroyImage)
     if( !qApp->desktop()->geometry().contains( p ))
         return QColor();
     unsigned long xpixel;
-    if (m_image == 0) {
+    if (m_image == NULL) {
         Window root = RootWindow(QX11Info::display(), QX11Info::appScreen());
         m_image = XGetImage(QX11Info::display(), root, p.x(), p.y(), 1, 1, -1, ZPixmap);
         xpixel = XGetPixel(m_image, 0, 0);
@@ -241,7 +243,7 @@ QColor ColorPickerWidget::grabColor(const QPoint &p, bool destroyImage)
                 &xcol);
     return QColor::fromRgbF(xcol.red / 65535.0, xcol.green / 65535.0, xcol.blue / 65535.0);
 #else
-    if (!m_image.isNull()) {
+    if (m_image.isNull()) {
         QWidget *desktop = QApplication::desktop();
         QPixmap pm = QPixmap::grabWindow(desktop->winId(), p.x(), p.y(), 1, 1);
         QImage i = pm.toImage();