Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -N -r541304f4e098b4c7617b718287ab40646d5deb92 -r847d6d10ae5b9a694b9b54d3b66051239d5cbea9
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 541304f4e098b4c7617b718287ab40646d5deb92)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 847d6d10ae5b9a694b9b54d3b66051239d5cbea9)
@@ -893,7 +893,6 @@
 	if (m_ctlShortcuts.EditLabel(iIndex) == nullptr)
 	{
 		TRACE("Couldn't edit shortcut list's item label\n");
-		return;
 	}
 }
 
Index: src/ch/PropertyListCtrl.h
===================================================================
diff -u -N -r541304f4e098b4c7617b718287ab40646d5deb92 -r847d6d10ae5b9a694b9b54d3b66051239d5cbea9
--- src/ch/PropertyListCtrl.h	(.../PropertyListCtrl.h)	(revision 541304f4e098b4c7617b718287ab40646d5deb92)
+++ src/ch/PropertyListCtrl.h	(.../PropertyListCtrl.h)	(revision 847d6d10ae5b9a694b9b54d3b66051239d5cbea9)
@@ -145,10 +145,10 @@
 	void			SetPropertyBkColor(COLORREF crColor);
 	void			SetHighlightColor(COLORREF crColor);
 	void			SetLineStyle(COLORREF crColor, int nStyle = PS_SOLID);
-	inline	void	SetBoldSelection(BOOL bBoldSelection)			{ m_bBoldSelection = bBoldSelection; }
-	inline	void	SetTextColor(COLORREF crColor)					{ m_crTextColor = crColor; }
-	inline	void	SetTextHighlightColor(COLORREF crColor)			{ m_crTextHighlightColor = crColor; }
-	inline	void	SetPropertyTextColor(COLORREF crColor)			{ m_crPropertyTextColor = crColor; }
+	void	SetBoldSelection(BOOL bBoldSelection)			{ m_bBoldSelection = bBoldSelection; }
+	void	SetTextColor(COLORREF crColor)					{ m_crTextColor = crColor; }
+	void	SetTextHighlightColor(COLORREF crColor)			{ m_crTextHighlightColor = crColor; }
+	void	SetPropertyTextColor(COLORREF crColor)			{ m_crPropertyTextColor = crColor; }
 
 	// Add the data
 	BOOL	AddString(CString csText);
Index: src/libchcore/TConfig.h
===================================================================
diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r847d6d10ae5b9a694b9b54d3b66051239d5cbea9
--- src/libchcore/TConfig.h	(.../TConfig.h)	(revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f)
+++ src/libchcore/TConfig.h	(.../TConfig.h)	(revision 847d6d10ae5b9a694b9b54d3b66051239d5cbea9)
@@ -133,13 +133,13 @@
 	};
 
 	template<class Type>
-	inline void SetConfigValue(TConfig& rConfig, PCTSTR pszPropName, const Type& rValue)
+	void SetConfigValue(TConfig& rConfig, PCTSTR pszPropName, const Type& rValue)
 	{
 		rConfig.SetValue(pszPropName, rValue);
 	}
 
 	template<class Type>
-	inline Type GetConfigValueDef(const TConfig& rConfig, PCTSTR pszPropName, const Type& rDefault)
+	Type GetConfigValueDef(const TConfig& rConfig, PCTSTR pszPropName, const Type& rDefault)
 	{
 		Type tValue;
 		if (!rConfig.GetValue(pszPropName, tValue))
@@ -148,7 +148,7 @@
 	}
 
 	template<class Type>
-	inline bool GetConfigValue(const TConfig& rConfig, PCTSTR pszPropName, Type& rValue)
+	bool GetConfigValue(const TConfig& rConfig, PCTSTR pszPropName, Type& rValue)
 	{
 		return rConfig.GetValue(pszPropName, rValue);
 	}