[Winmerge-svn] SF.net SVN: winmerge: [4069] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2007-01-18 18:35:38
|
Revision: 4069 http://svn.sourceforge.net/winmerge/?rev=4069&view=rev Author: kimmov Date: 2007-01-18 10:35:26 -0800 (Thu, 18 Jan 2007) Log Message: ----------- BUG: [ 1637433 ] Forget selected filter after close Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Merge.cpp trunk/Src/OptionsInit.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2007-01-17 17:18:57 UTC (rev 4068) +++ trunk/Src/Changes.txt 2007-01-18 18:35:26 UTC (rev 4069) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-01-17 Kimmo + BUG: [ 1637433 ] Forget selected filter after close + Src: Merge.cpp OptionsInit.cpp + 2007-01-16 Kimmo PATCH: [ 1636314 ] Fix limiting to single file compare window Src: MainFrm.cpp Modified: trunk/Src/Merge.cpp =================================================================== --- trunk/Src/Merge.cpp 2007-01-17 17:18:57 UTC (rev 4068) +++ trunk/Src/Merge.cpp 2007-01-18 18:35:26 UTC (rev 4069) @@ -256,6 +256,16 @@ InitializeFileFilters(); + // Read last used filter from registry + // If filter fails to set, reset to default + const CString filterString = m_pOptions->GetString(OPT_FILEFILTER_CURRENT); + BOOL bFilterSet = theApp.m_globalFileFilter.SetFilter(filterString); + if (!bFilterSet) + { + CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask(); + m_pOptions->SaveOption(OPT_FILEFILTER_CURRENT, filter); + } + CSplashWnd::EnableSplashScreen(bDisableSplash==FALSE && cmdInfo.m_nShellCommand == CCommandLineInfo::FileNew); // Initialize i18n (multiple language) support Modified: trunk/Src/OptionsInit.cpp =================================================================== --- trunk/Src/OptionsInit.cpp 2007-01-17 17:18:57 UTC (rev 4068) +++ trunk/Src/OptionsInit.cpp 2007-01-18 18:35:26 UTC (rev 4069) @@ -128,13 +128,4 @@ m_pOptions->InitOption(OPT_ARCHIVE_ENABLE, 1); // Enable by default m_pOptions->InitOption(OPT_ARCHIVE_PROBETYPE, false); - - // Read last used filter from registry - // If filter fails to set, reset to default - BOOL bFilterSet = theApp.m_globalFileFilter.SetFilter(m_pOptions->GetString(OPT_FILEFILTER_CURRENT)); - if (!bFilterSet) - { - CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask(); - m_pOptions->SaveOption(OPT_FILEFILTER_CURRENT, filter); - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |