[labeling] Fix line orientation option gets checked randomly

nyalldawson · nyalldawson · commit 01a402ca113b · 2016-10-11T10:44:26.000+10:00
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -659,8 +659,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
`@@ -659,8 +659,7 @@ void QgsLabelingGui::init()`
`659`	`659`	`chkLineAbove->setChecked( lyr.placementFlags & QgsPalLayerSettings::AboveLine );`
`660`	`660`	`chkLineBelow->setChecked( lyr.placementFlags & QgsPalLayerSettings::BelowLine );`
`661`	`661`	`chkLineOn->setChecked( lyr.placementFlags & QgsPalLayerSettings::OnLine );`
`662`		`- if ( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) )`
`663`		`- chkLineOrientationDependent->setChecked( true );`
	`662`	`+ chkLineOrientationDependent->setChecked( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) );`
`664`	`663`
`665`	`664`	`switch ( lyr.placement )`
`666`	`665`	`{`