From ea4143bbdc757993bd1e4157f6de0814052adee0 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Tue, 9 May 2017 19:45:19 +1000
Subject: [PATCH] Don't disable band combo when only one band is present

---
 src/gui/raster/qgsrasterbandcombobox.cpp       | 2 --
 tests/src/python/test_qgsrasterbandcombobox.py | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/src/gui/raster/qgsrasterbandcombobox.cpp b/src/gui/raster/qgsrasterbandcombobox.cpp
index e1418264d60..2d4cda24ba3 100644
--- a/src/gui/raster/qgsrasterbandcombobox.cpp
+++ b/src/gui/raster/qgsrasterbandcombobox.cpp
@@ -25,7 +25,6 @@ QgsRasterBandComboBox::QgsRasterBandComboBox( QWidget *parent )
   {
     emit bandChanged( currentIndex() >= 0 ? currentData().toInt() : -1 );
   } );
-  setEnabled( false );
 }
 
 QgsRasterLayer *QgsRasterBandComboBox::layer() const
@@ -63,7 +62,6 @@ void QgsRasterBandComboBox::setLayer( QgsMapLayer *layer )
       }
     }
   }
-  setEnabled( count() > 1 );
 
   if ( count() > 0 )
     setCurrentIndex( findData( oldBand ) >= 0 ? findData( oldBand ) : 0 );
diff --git a/tests/src/python/test_qgsrasterbandcombobox.py b/tests/src/python/test_qgsrasterbandcombobox.py
index 858b389c366..92bb74c09d3 100644
--- a/tests/src/python/test_qgsrasterbandcombobox.py
+++ b/tests/src/python/test_qgsrasterbandcombobox.py
@@ -35,11 +35,9 @@ class TestQgsRasterBandComboBox(unittest.TestCase):
         combo = QgsRasterBandComboBox()
         self.assertFalse(combo.layer())
         self.assertEqual(combo.currentBand(), -1)
-        self.assertFalse(combo.isEnabled())
 
         combo.setShowNotSetOption(True)
         self.assertEqual(combo.currentBand(), -1)
-        self.assertFalse(combo.isEnabled())
 
         combo.setBand(11111)
         self.assertEqual(combo.currentBand(), -1)
@@ -58,14 +56,11 @@ class TestQgsRasterBandComboBox(unittest.TestCase):
         combo.setLayer(layer)
         self.assertEqual(combo.layer(), layer)
         self.assertEqual(combo.currentBand(), 1)
-        # only one choice, should be disabled
         self.assertEqual(combo.count(), 1)
-        self.assertFalse(combo.isEnabled())
 
         combo.setShowNotSetOption(True)
         self.assertEqual(combo.currentBand(), 1)
         self.assertEqual(combo.count(), 2)
-        self.assertTrue(combo.isEnabled())
         combo.setBand(-1)
         self.assertEqual(combo.currentBand(), -1)
         combo.setBand(1)
@@ -74,7 +69,6 @@ class TestQgsRasterBandComboBox(unittest.TestCase):
         combo.setShowNotSetOption(False)
         self.assertEqual(combo.currentBand(), 1)
         self.assertEqual(combo.count(), 1)
-        self.assertFalse(combo.isEnabled())
 
     def testMultiBandRaster(self):
         path = os.path.join(unitTestDataPath('raster'),
@@ -89,19 +83,16 @@ class TestQgsRasterBandComboBox(unittest.TestCase):
         self.assertEqual(combo.layer(), layer)
         self.assertEqual(combo.currentBand(), 1)
         self.assertEqual(combo.count(), 3)
-        self.assertTrue(combo.isEnabled())
         combo.setBand(2)
         self.assertEqual(combo.currentBand(), 2)
 
         combo.setShowNotSetOption(True)
         self.assertEqual(combo.currentBand(), 2)
         self.assertEqual(combo.count(), 4)
-        self.assertTrue(combo.isEnabled())
 
         combo.setShowNotSetOption(False)
         self.assertEqual(combo.currentBand(), 2)
         self.assertEqual(combo.count(), 3)
-        self.assertTrue(combo.isEnabled())
 
     def testSignals(self):
         path = os.path.join(unitTestDataPath('raster'),