[labeling] Fix line orientation option gets checked randomly

nyalldawson · nyalldawson · commit 44224617ac4a · 2016-10-12T20:54:39.000+10:00
(cherry-picked from 01a402c)
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -661,8 +661,7 @@ void QgsLabelingGui::init()
   chkLineAbove->setChecked( lyr.placementFlags & QgsPalLayerSettings::AboveLine );
   chkLineBelow->setChecked( lyr.placementFlags & QgsPalLayerSettings::BelowLine );
   chkLineOn->setChecked( lyr.placementFlags & QgsPalLayerSettings::OnLine );
-  if ( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) )
-    chkLineOrientationDependent->setChecked( true );
+  chkLineOrientationDependent->setChecked( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) );
 
   switch ( lyr.placement )
   {

Original file line number	Diff line number	Diff line change
`@@ -661,8 +661,7 @@ void QgsLabelingGui::init()`
`661`	`661`	`chkLineAbove->setChecked( lyr.placementFlags & QgsPalLayerSettings::AboveLine );`
`662`	`662`	`chkLineBelow->setChecked( lyr.placementFlags & QgsPalLayerSettings::BelowLine );`
`663`	`663`	`chkLineOn->setChecked( lyr.placementFlags & QgsPalLayerSettings::OnLine );`
`664`		`- if ( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) )`
`665`		`- chkLineOrientationDependent->setChecked( true );`
	`664`	`+ chkLineOrientationDependent->setChecked( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) );`
`666`	`665`
`667`	`666`	`switch ( lyr.placement )`
`668`	`667`	`{`