OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cb0f77c
)
PathDlg.cpp: Fix a problem that typed-in Context in Generate Patch is not applied...
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sat, 3 Feb 2018 12:47:23 +0000
(21:47 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sat, 3 Feb 2018 12:47:23 +0000
(21:47 +0900)
Src/PatchDlg.cpp
patch
|
blob
|
history
diff --git
a/Src/PatchDlg.cpp
b/Src/PatchDlg.cpp
index
720676f
..
411e129
100644
(file)
--- a/
Src/PatchDlg.cpp
+++ b/
Src/PatchDlg.cpp
@@
-170,15
+170,7
@@
void CPatchDlg::OnOK()
default: m_outputStyle = (enum output_style)OUTPUT_NORMAL; break;
}
- int contextSel = m_comboContext.GetCurSel();
- if (contextSel != CB_ERR)
- {
- CString contextText;
- m_comboContext.GetLBText(contextSel, contextText);
- m_contextLines = std::stoi((String)contextText);
- }
- else
- m_contextLines = 0;
+ m_contextLines = GetDlgItemInt(IDC_DIFF_CONTEXT);
SaveSettings();