Skip to content

Fixed crashes when picking apps to run for diff/merge/view #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vtslothy wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed crashes when picking apps to run for diff/merge/view #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17956ed
Fixed crashes when picking apps to run for diff/merge/view
vtslothy Mar 3, 2021
3cfcd7f
Merge branch 'gorlak:master' into master
vtslothy Jun 10, 2021
7aac776
Update .gitignore
vtslothy Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Bin/
Build/
*.aps
*.aps
Dependencies/
2 changes: 1 addition & 1 deletion Source/gui/OptionsDlg/EditorsPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void CEditorsPage::OnBrowse()
CFileDialog fDlg(TRUE, NULL, NULL,
OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NONETWORKBUTTON | OFN_PATHMUSTEXIST,
LoadStringResource(IDS_TEXT_EDITOR_FILTER), this,
MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME));
MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME), FALSE);

TCHAR buf[MAX_PATH];
// Zero 1st char so commdlg knows we aren't providing a default filename
Expand Down
7 changes: 4 additions & 3 deletions Source/gui/OptionsDlg/HelperAppsPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,11 @@ void CHelperAppsPage::Browse(CString &filename, LPCTSTR title)
{
CFileDialog fDlg(TRUE, NULL, NULL,
OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NONETWORKBUTTON | OFN_PATHMUSTEXIST,
LoadStringResource(IDS_HELPER_APPS_FILTER), this,
MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME));
LoadStringResource(IDS_HELPER_APPS_FILTER),
this,
MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME), FALSE);

TCHAR buf[MAX_PATH];
TCHAR buf[MAX_PATH+1];
// Zero 1st char so commdlg knows we aren't providing a default filename
buf[0]=_T('\0');

Expand Down
2 changes: 1 addition & 1 deletion Source/gui/OptionsDlg/MergeAppPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ void CMergeAppPage::Browse(CString &filename, LPCTSTR title)
CFileDialog fDlg(TRUE, NULL, NULL,
OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NONETWORKBUTTON | OFN_PATHMUSTEXIST,
LoadStringResource(IDS_HELPER_APPS_FILTER), this,
MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME));
MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME), FALSE);

TCHAR buf[MAX_PATH];
// Zero 1st char so commdlg knows we aren't providing a default filename
Expand Down