From f7e68b9c12f4657d7ecc341483285efbf5b171a6 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:27:07 +0200
Subject: 5.20

---
 BUILD/Changelog.txt  | 5 +++++
 lib/resolve_path.cpp | 2 +-
 ui/dir_name.cpp      | 2 +-
 version/version.h    | 2 +-
 wx+/file_drop.h      | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index d8e3ad35..d267dca0 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -1,3 +1,8 @@
+FreeFileSync 5.20
+-----------------
+Fixed crash on startup due to wxWigets 64-bit bug in font enumeration (Windows 8)
+
+
 FreeFileSync 5.19
 -----------------
 Redesigned progress dialog including new items graph
diff --git a/lib/resolve_path.cpp b/lib/resolve_path.cpp
index daa99d2a..f4049590 100644
--- a/lib/resolve_path.cpp
+++ b/lib/resolve_path.cpp
@@ -598,7 +598,7 @@ void zen::loginNetworkShare(const Zstring& dirnameOrig, bool allowUserInteractio
     	user account:	<Domain>\<user>		e.g. WIN-XP\ZenJu
     	network share:	\\<server>\<share>	e.g. \\WIN-XP\test
 
-    Windows Command Line:
+    Windows Command Line: 
     - list *all* active network connections, including deviceless ones which are hidden in Explorer:
     		net use
     - delete active connection:
diff --git a/ui/dir_name.cpp b/ui/dir_name.cpp
index 7a068343..356b0888 100644
--- a/ui/dir_name.cpp
+++ b/ui/dir_name.cpp
@@ -235,7 +235,7 @@ void DirectoryName<NameControl>::onSelectDir(wxCommandEvent& event)
             newFolder = make_unique<wxString>(selectedFolder);
         }
     }
-#endif
+#endif 
     if (!newFolder.get())
     {
         wxDirDialog dirPicker(&selectButton_, _("Select a folder"), defaultDirname); //put modal wxWidgets dialogs on stack: creating on freestore leads to memleak!
diff --git a/version/version.h b/version/version.h
index 42589d07..323fa8c4 100644
--- a/version/version.h
+++ b/version/version.h
@@ -3,7 +3,7 @@
 
 namespace zen
 {
-const wchar_t currentVersion[] = L"5.19"; //internal linkage!
+    const wchar_t currentVersion[] = L"5.20"; //internal linkage!
 }
 
 #endif
diff --git a/wx+/file_drop.h b/wx+/file_drop.h
index 0916b0cb..fb56c5d9 100644
--- a/wx+/file_drop.h
+++ b/wx+/file_drop.h
@@ -7,6 +7,7 @@
 #ifndef FILE_DROP_H_INCLUDED
 #define FILE_DROP_H_INCLUDED
 
+#include <vector>
 #include <wx/window.h>
 #include <wx/event.h>
 #include <wx/dnd.h>
-- 
cgit