comparison layer/SingleColourLayer.cpp @ 366:a55affd7ab6c

* Avoid setting a new colour on layer when adding the same layer more than
  once

 SingleColourLayer::ColourRefCount 
 SingleColourLayer::m_colourRefCount;
 
 SingleColourLayer::SingleColourLayer() :
     m_colour(0),
-    m_colourExplicitlySet(false)
+    m_colourExplicitlySet(false),
+    m_defaultColourSet(false)
 {
     setDefaultColourFor(0);
 }
 
 QPixmap

 }
 
 void
 SingleColourLayer::setDefaultColourFor(View *v)
 {
-    if (m_colourExplicitlySet) return;
+    std::cerr << "SingleColourLayer::setDefaultColourFor: m_colourExplicitlySet = " << m_colourExplicitlySet << ", m_defaultColourSet " << m_defaultColourSet << std::endl;
+
+    if (m_colourExplicitlySet || m_defaultColourSet) return;
 
     bool dark = false;
     if (v) {
         dark = !v->hasLightBackground();
     } else {

 //        std::cerr << "(from ctor)" << std::endl;
     }
 
     if (hint >= 0 && impose) {
         setBaseColour(hint);
+        m_defaultColourSet = true;
         return;
     }
 
     int bestCount = 0, bestColour = -1;
     

     if (m_colourRefCount.find(m_colour) == m_colourRefCount.end()) {
         m_colourRefCount[m_colour] = 1;
     } else {
         m_colourRefCount[m_colour]++;
     }
+
+    m_defaultColourSet = true;
 }
 
 void
 SingleColourLayer::setBaseColour(int colour)
 {