@@ -608,21 +608,30 @@ private void OnGitLfsLocksGUI()
608
608
609
609
private void OnInstallPathGUI ( )
610
610
{
611
+ string gitExecPath = null ;
612
+ string extension = null ;
613
+ string gitInstallPath = null ;
614
+ if ( Environment != null )
615
+ {
616
+ extension = Environment . ExecutableExtension ;
617
+ gitInstallPath = Environment . GitInstallPath ;
618
+ if ( Environment . GitExecutablePath != null )
619
+ gitExecPath = Environment . GitExecutablePath . ToString ( ) ;
620
+ }
621
+
622
+
611
623
// Install path
612
624
GUILayout . Label ( GitInstallTitle , EditorStyles . boldLabel ) ;
613
625
614
- GUI . enabled = ! busy ;
626
+ GUI . enabled = ! busy && gitExecPath != null ;
615
627
616
- var gitExecPath = Environment . GitExecutablePath . ToString ( ) ;
617
628
// Install path field
618
629
EditorGUI . BeginChangeCheck ( ) ;
619
630
{
620
631
//TODO: Verify necessary value for a non Windows OS
621
- var extension = Environment . ExecutableExtension ;
622
-
623
632
Styles . PathField ( ref gitExecPath ,
624
633
( ) => EditorUtility . OpenFilePanel ( GitInstallBrowseTitle ,
625
- Environment . GitInstallPath ,
634
+ gitInstallPath ,
626
635
extension ) , ValidateGitInstall ) ;
627
636
}
628
637
if ( EditorGUI . EndChangeCheck ( ) )
@@ -656,11 +665,13 @@ private void OnInstallPathGUI()
656
665
657
666
private void OnPrivacyGui ( )
658
667
{
668
+ var service = Manager != null && Manager . UsageTracker != null ? Manager . UsageTracker : null ;
669
+
659
670
GUILayout . Label ( PrivacyTitle , EditorStyles . boldLabel ) ;
660
671
661
- GUI . enabled = ! busy ;
672
+ GUI . enabled = ! busy && service != null ;
662
673
663
- var metricsEnabled = EntryPoint . UsageTracker . Enabled ;
674
+ var metricsEnabled = service != null ? service . Enabled : false ;
664
675
EditorGUI . BeginChangeCheck ( ) ;
665
676
{
666
677
metricsEnabled = EditorGUILayout . Toggle ( MetricsOptInLabel , metricsEnabled ) ;
0 commit comments