-Added check to make sure preferred bands combinations are valid

-Closes ticket #1852 git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14032 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 9, 2010 · 82c2435 · 82c2435
1 parent 7a8849e
commit 82c2435
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -5412,16 +5412,37 @@ bool QgsRasterLayer::readFile( QString const &theFilename )
     //we know we have at least 2 layers...
     mRedBandName = bandName( myQSettings.value( "/Raster/defaultRedBand", 1 ).toInt() );  // sensible default
     mGreenBandName = bandName( myQSettings.value( "/Raster/defaultGreenBand", 2 ).toInt() );  // sensible default
+
+    //Check to make sure preferred bands combinations are valid
+    if ( mRedBandName.isEmpty() )
+    {
+      mRedBandName = bandName( 1 );
+    }
+
+    if ( mGreenBandName.isEmpty() )
+    {
+      mGreenBandName = bandName( 2 );
+    }
+
     //for the third layer we cant be sure so..
     if ( GDALGetRasterCount( mGdalDataset ) > 2 )
     {
       mBlueBandName = bandName( myQSettings.value( "/Raster/defaultBlueBand", 3 ).toInt() ); // sensible default
+      if ( mBlueBandName.isEmpty() )
+      {
+        mBlueBandName = bandName( 3 );
+      }
     }
     else
     {
       mBlueBandName = bandName( myQSettings.value( "/Raster/defaultBlueBand", 2 ).toInt() );  // sensible default
+      if ( mBlueBandName.isEmpty() )
+      {
+        mBlueBandName = bandName( 2 );
+      }
     }
 
+
     mTransparencyBandName = TRSTRING_NOT_SET;
     mGrayBandName = TRSTRING_NOT_SET;  //sensible default
     mDrawingStyle = MultiBandColor;  //sensible default