Index: src/ch/FilterDlg.cpp =================================================================== diff -u -N -r9250a0229add10f4315e76848c755f337a16ae95 -r63369021254e8b67ffeef5a9ece1b5a70df881c4 --- src/ch/FilterDlg.cpp (.../FilterDlg.cpp) (revision 9250a0229add10f4315e76848c755f337a16ae95) +++ src/ch/FilterDlg.cpp (.../FilterDlg.cpp) (revision 63369021254e8b67ffeef5a9ece1b5a70df881c4) @@ -21,6 +21,7 @@ #include "FilterDlg.h" #include "resource.h" #include "../libstring/TStringArray.h" +#include #ifdef _DEBUG #define new DEBUG_NEW @@ -338,8 +339,7 @@ void CFilterDlg::OnOK() { UpdateData(TRUE); - - // TFileFilter --> dialogu - mask + CString strText; m_ctlIncludeMask.GetWindowText(strText); m_ffFilter.SetUseMask(((m_bFilter != 0) && !strText.IsEmpty())); @@ -386,6 +386,18 @@ m_ffFilter.SetSystem(m_iSystem); m_ffFilter.SetDirectory(m_iDirectory); + if(!FilterTypesMenuWrapper::ValidateFilter(m_ffFilter.GetIncludeMask())) + { + m_ctlIncludeMask.SetFocus(); + return; + } + + if(!FilterTypesMenuWrapper::ValidateFilter(m_ffFilter.GetExcludeMask())) + { + m_ctlExcludeMask.SetFocus(); + return; + } + CLanguageDialog::OnOK(); }