X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7426f4ca3ca80554c6360f7385741e971a96af3..3d2d9036037d9ee51f47d878c3dcef4af4a6ef41:/wxPython/wx/lib/filebrowsebutton.py

diff --git a/wxPython/wx/lib/filebrowsebutton.py b/wxPython/wx/lib/filebrowsebutton.py
index c731be2b6e..ca3338f462 100644
--- a/wxPython/wx/lib/filebrowsebutton.py
+++ b/wxPython/wx/lib/filebrowsebutton.py
@@ -289,8 +289,10 @@ class FileBrowseButtonWithHistory( FileBrowseButton ):
         """Return the current history list"""
         if self.historyCallBack != None:
             return self.historyCallBack()
-        else:
+        elif self.history:
             return list( self.history )
+        else:
+            return []
 
 
     def OnSetFocus(self, event):