Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r541304f4e098b4c7617b718287ab40646d5deb92
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 541304f4e098b4c7617b718287ab40646d5deb92)
@@ -24,7 +24,6 @@
 #include "Theme Helpers.h"
 #include "shlobj.h"
 #include "StringHelpers.h"
-#include "FileSupport.h"
 #include "TRecentPathsTools.h"
 #include "resource.h"
 #include "shortcuts.h"
@@ -35,7 +34,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-// dialog jako taki
+// dialog template
 const unsigned long __g_DlgTemplate[]={ 
 	0x82cf0040, 0x00000000, 0x00000000, 0x011b0000, 0x000000b4, 0x00000000, 0x00540008, 0x00680061, 
 	0x006d006f, 0x00000061 };
@@ -108,14 +107,14 @@
 LRESULT CALLBACK EditWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	return InternalWindowProc(__g_pfEdit, hwnd, uMsg, wParam, lParam);
-};
+}
 
 ////////////////////////////////////////////////////////////////////////////
 // procedure for combo box contained in comboboxex
 LRESULT CALLBACK ComboWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	return InternalWindowProc(__g_pfBaseCombo, hwnd, uMsg, wParam, lParam);
-};
+}
 
 ////////////////////////////////////////////////////////////////////////////
 // other visual elements' window proc
@@ -149,8 +148,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // CFolderDialog dialog
 
-CFolderDialog::CFolderDialog(CWnd* /*pParent*/ /*=nullptr*/)
-				:ictranslate::CLanguageDialog()
+CFolderDialog::CFolderDialog(CWnd* /*pParent*/ /*=nullptr*/) :
+	ictranslate::CLanguageDialog(),
+	m_fsLocal(GetLogFileData())
 {
 	m_hImages=nullptr;
 	m_hLargeImages=nullptr;
@@ -389,6 +389,10 @@
 	if (CreateControls() == -1)
 		EndDialog(-1);
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	// size of a dialog
 	CRect rcDialog;
 	GetClientRect(&rcDialog);
@@ -658,12 +662,17 @@
 		if (!bSkipFreeSpace)
 		{
 			// get disk free space
-			unsigned long long ullFree, ullTotal;
-			if (GetDynamicFreeSpace(strPath, &ullFree, &ullTotal))
+			try
 			{
+				unsigned long long ullFree = 0, ullTotal = 0;
+
+				m_fsLocal.GetDynamicFreeSpace(chcore::PathFromString(strPath), ullFree, ullTotal);
 				m_strTip += GetResManager().LoadString(IDS_BDFREESPACE_STRING) + GetSizeString(ullFree, false) + _T("\n");
 				m_strTip += GetResManager().LoadString(IDS_BDCAPACITY_STRING) + GetSizeString(ullTotal, false) + _T("\n");
 			}
+			catch (const std::exception&)
+			{
+			}
 		}
 	}
 
@@ -697,12 +706,17 @@
 	m_strTip=sc.m_strName+_T("\r\n")+CString(GetResManager().LoadString(IDS_BDPATH2_STRING))+sc.m_strPath;
 
 	// get disk free space
-	unsigned long long ullFree, ullTotal;
-	if (GetDynamicFreeSpace(sc.m_strPath, &ullFree, &ullTotal))
+	try
 	{
-		m_strTip+=CString(_T("\r\n"))+GetResManager().LoadString(IDS_BDFREESPACE_STRING) + GetSizeString(ullFree, false) + _T("\n");
-		m_strTip+=GetResManager().LoadString(IDS_BDCAPACITY_STRING) + GetSizeString(ullTotal, false);
+		unsigned long long ullFree = 0, ullTotal = 0;
+
+		m_fsLocal.GetDynamicFreeSpace(chcore::PathFromString(sc.m_strPath), ullFree, ullTotal);
+		m_strTip += CString(_T("\r\n")) + GetResManager().LoadString(IDS_BDFREESPACE_STRING) + GetSizeString(ullFree, false) + _T("\n");
+		m_strTip += GetResManager().LoadString(IDS_BDCAPACITY_STRING) + GetSizeString(ullTotal, false);
 	}
+	catch(const std::exception&)
+	{
+	}
 
 	pit->pszText=(LPTSTR)(LPCTSTR)m_strTip;
 	pit->cchTextMax=m_strTip.GetLength()+1;