Merge pull request #233 from github-for-unity/fixes/settings-view-code-cleanup

StanleyGoldman · web-flow · commit c667a8e8be8d · 2017-09-06T13:05:45.000-04:00
Some simple logic cleanup in SettingsView
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -752,13 +752,13 @@ private void OnInstallPathGUI()
 
         private void OnPrivacyGui()
         {
-            var service = Manager != null && Manager.UsageTracker != null ? Manager.UsageTracker : null;
+            var service = Manager != null ? Manager.UsageTracker : null;
 
             GUILayout.Label(PrivacyTitle, EditorStyles.boldLabel);
 
             EditorGUI.BeginDisabledGroup(isBusy || service == null);
             {
-                var metricsEnabled = service != null ? service.Enabled : false;
+                var metricsEnabled = service != null && service.Enabled;
                 EditorGUI.BeginChangeCheck();
                 {
                     metricsEnabled = GUILayout.Toggle(metricsEnabled, MetricsOptInLabel);

Original file line number	Diff line number	Diff line change
`@@ -752,13 +752,13 @@ private void OnInstallPathGUI()`
`752`	`752`
`753`	`753`	`private void OnPrivacyGui()`
`754`	`754`	`{`
`755`		`- var service = Manager != null && Manager.UsageTracker != null ? Manager.UsageTracker : null;`
	`755`	`+ var service = Manager != null ? Manager.UsageTracker : null;`
`756`	`756`
`757`	`757`	`GUILayout.Label(PrivacyTitle, EditorStyles.boldLabel);`
`758`	`758`
`759`	`759`	`EditorGUI.BeginDisabledGroup(isBusy \|\| service == null);`
`760`	`760`	`{`
`761`		`- var metricsEnabled = service != null ? service.Enabled : false;`
	`761`	`+ var metricsEnabled = service != null && service.Enabled;`
`762`	`762`	`EditorGUI.BeginChangeCheck();`
`763`	`763`	`{`
`764`	`764`	`metricsEnabled = GUILayout.Toggle(metricsEnabled, MetricsOptInLabel);`