From a4c0e0a59c7c2674533d6c1429bb8225a263c0b3 Mon Sep 17 00:00:00 2001 From: bao-qian Date: Fri, 6 May 2016 00:00:15 +0100 Subject: [PATCH] Fix select result when there is no results part of #412 --- Wox/ViewModel/ResultsViewModel.cs | 38 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/Wox/ViewModel/ResultsViewModel.cs b/Wox/ViewModel/ResultsViewModel.cs index 975ce52971..bb258141f6 100644 --- a/Wox/ViewModel/ResultsViewModel.cs +++ b/Wox/ViewModel/ResultsViewModel.cs @@ -118,7 +118,7 @@ namespace Wox.ViewModel public void SelectNextResult() { - if (SelectedResult != null) + if (Results.Count > 0 && SelectedResult != null) { var index = Results.IndexOf(SelectedResult); if (index == Results.Count - 1) @@ -131,7 +131,7 @@ namespace Wox.ViewModel public void SelectPrevResult() { - if (SelectedResult != null) + if (Results.Count > 0 && SelectedResult != null) { var index = Results.IndexOf(SelectedResult); if (index == 0) @@ -144,32 +144,30 @@ namespace Wox.ViewModel public void SelectNextPage() { - var index = 0; - if (SelectedResult != null) + if (Results.Count > 0 && SelectedResult != null) { - index = Results.IndexOf(SelectedResult); + var index = Results.IndexOf(SelectedResult); + index += 5; + if (index > Results.Count - 1) + { + index = Results.Count - 1; + } + SelectedResult = Results.ElementAt(index); } - index += 5; - if (index > Results.Count - 1) - { - index = Results.Count - 1; - } - SelectedResult = Results.ElementAt(index); } public void SelectPrevPage() { - var index = 0; - if (SelectedResult != null) + if (Results.Count > 0 && SelectedResult != null) { - index = Results.IndexOf(SelectedResult); + var index = Results.IndexOf(SelectedResult); + index -= 5; + if (index < 0) + { + index = 0; + } + SelectedResult = Results.ElementAt(index); } - index -= 5; - if (index < 0) - { - index = 0; - } - SelectedResult = Results.ElementAt(index); } public void Clear()