@@ -29,7 +29,6 @@ public class PullRequestListViewModel : BaseViewModel, IPullRequestListViewModel
2929 readonly TrackingCollection < IAccount > trackingAssignees ;
3030 readonly IPackageSettings settings ;
3131 readonly PullRequestListUIState listSettings ;
32- bool pullRequestsLoaded ;
3332
3433 [ ImportingConstructor ]
3534 PullRequestListViewModel (
@@ -84,11 +83,11 @@ public PullRequestListViewModel(
8483 . Subscribe ( s => UpdateFilter ( s , SelectedAssignee , SelectedAuthor ) ) ;
8584
8685 this . WhenAny ( x => x . SelectedAssignee , x => x . Value )
87- . Where ( x => PullRequests != null && x != EmptyUser && pullRequestsLoaded )
86+ . Where ( x => PullRequests != null && x != EmptyUser && IsLoaded )
8887 . Subscribe ( a => UpdateFilter ( SelectedState , a , SelectedAuthor ) ) ;
8988
9089 this . WhenAny ( x => x . SelectedAuthor , x => x . Value )
91- . Where ( x => PullRequests != null && x != EmptyUser && pullRequestsLoaded )
90+ . Where ( x => PullRequests != null && x != EmptyUser && IsLoaded )
9291 . Subscribe ( a => UpdateFilter ( SelectedState , SelectedAssignee , a ) ) ;
9392
9493 SelectedState = States . FirstOrDefault ( x => x . Name == listSettings . SelectedState ) ?? States [ 0 ] ;
@@ -98,7 +97,7 @@ public override void Initialize([AllowNull] ViewWithData data)
9897 {
9998 base . Initialize ( data ) ;
10099
101- pullRequestsLoaded = false ;
100+ IsLoaded = false ;
102101
103102 PullRequests = repositoryHost . ModelService . GetPullRequests ( repository , pullRequests ) ;
104103 pullRequests . Subscribe ( pr =>
@@ -121,7 +120,7 @@ public override void Initialize([AllowNull] ViewWithData data)
121120 SelectedAssignee = Assignees . FirstOrDefault ( x => x . Login == listSettings . SelectedAssignee ) ;
122121 }
123122
124- pullRequestsLoaded = true ;
123+ IsLoaded = true ;
125124 UpdateFilter ( SelectedState , SelectedAssignee , SelectedAuthor ) ;
126125 } ) ;
127126 }
@@ -136,6 +135,13 @@ void UpdateFilter(PullRequestState state, [AllowNull]IAccount ass, [AllowNull]IA
136135 ( aut == null || aut . Equals ( pr . Author ) ) ;
137136 }
138137
138+ bool isLoaded ;
139+ public bool IsLoaded
140+ {
141+ get { return isLoaded ; }
142+ private set { this . RaiseAndSetIfChanged ( ref isLoaded , value ) ; }
143+ }
144+
139145 ITrackingCollection < IPullRequestModel > pullRequests ;
140146 public ITrackingCollection < IPullRequestModel > PullRequests
141147 {
0 commit comments