New SQLite version

[pithos-ms-client] / trunk / Pithos.Client.WPF / FileProperties / ConflictsViewModel.cs

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
index b49bbee..da7a840 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
@@ -99,9 +99,11 @@ namespace Pithos.Client.WPF.FileProperties
         public ConflictsViewModel()
         {
                        this.DisplayName="Conflicts";
-            var conflicts = from state in FileState.Queryable
-                            where state.FileStatus == FileStatus.Conflict ||
-                                  state.OverlayStatus == FileOverlayStatus.Conflict
+            var fileStates = from state in FileState.Queryable
+                         where state.FileStatus == FileStatus.Conflict ||
+                               state.OverlayStatus == FileOverlayStatus.Conflict
+                         select state;
+            var conflicts = from state in fileStates
                             let info=FileInfoExtensions.FromPath(state.FilePath)
                             select new ConflictFile {FilePath = state.FilePath,Reason=state.ConflictReason,LocalModified = info.LastWriteTime};          
             _conflicts = new ObservableCollection<ConflictFile>(conflicts.ToList());