From 5a3669cbe7c8c9f69e19db74306a44d9640cbead Mon Sep 17 00:00:00 2001
From: qianlifeng <qianlf2008@163.com>
Date: Thu, 20 Feb 2014 18:26:01 +0800
Subject: [PATCH] Bug fix

---
 Wox/ImagePathConverter.cs | 8 ++++----
 Wox/ResultPanel.xaml      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Wox/ImagePathConverter.cs b/Wox/ImagePathConverter.cs
index 2f7cb8154..41d754370 100644
--- a/Wox/ImagePathConverter.cs
+++ b/Wox/ImagePathConverter.cs
@@ -41,10 +41,10 @@ namespace Wox
             {
                 return GetIcon(resolvedPath);
             }
-            else
-            {
-                return new BitmapImage(new Uri(resolvedPath));
-            }
+
+            if(!string.IsNullOrEmpty(path)) return new BitmapImage(new Uri(resolvedPath));
+
+            return null;
         }
 
         public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
diff --git a/Wox/ResultPanel.xaml b/Wox/ResultPanel.xaml
index b68df11cf..70406144e 100644
--- a/Wox/ResultPanel.xaml
+++ b/Wox/ResultPanel.xaml
@@ -11,7 +11,7 @@
     </UserControl.Resources>
 
     <Grid>
-        <ListBox x:Name="lbResults" ScrollViewer.HorizontalScrollBarVisibility="Hidden" SelectionChanged ="lbResults_SelectionChanged"  Focusable="False"  KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single" BorderBrush="Transparent" Background="Transparent" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Recycling">
+        <ListBox x:Name="lbResults" ScrollViewer.CanContentScroll="False" ScrollViewer.HorizontalScrollBarVisibility="Hidden" SelectionChanged ="lbResults_SelectionChanged"  Focusable="False"  KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single" BorderBrush="Transparent" Background="Transparent" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Recycling">
             <ListBox.Resources>
                 <!--SelectedItem with focus-->
                 <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="#4F6180"/>