diff options
| author | sansnom05 <sansnom05@users.sourceforge.net> | 2010-12-16 16:53:08 +0300 |
|---|---|---|
| committer | sansnom05 <sansnom05@users.sourceforge.net> | 2010-12-16 16:53:08 +0300 |
| commit | f0d88a6ff96770b10031dcc59447cca2c7dbc91c (patch) | |
| tree | e188e4e733fcf6fc9b00dc349618c19f4d47a7c9 /src/apps/mplayerc/ShaderCombineDlg.cpp | |
| parent | 5067b0b48d4d15b24669c8032b28e90e45202801 (diff) | |
legacy branch: merge r2662-r2759
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2778 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc/ShaderCombineDlg.cpp')
| -rw-r--r-- | src/apps/mplayerc/ShaderCombineDlg.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/apps/mplayerc/ShaderCombineDlg.cpp b/src/apps/mplayerc/ShaderCombineDlg.cpp index 9c938b39c..02f684e61 100644 --- a/src/apps/mplayerc/ShaderCombineDlg.cpp +++ b/src/apps/mplayerc/ShaderCombineDlg.cpp @@ -72,9 +72,9 @@ BOOL CShaderCombineDlg::OnInitDialog() CString str;
if (m_bScreenSpace)
- str = s.m_shadercombineScreenSpace.Trim();
+ str = s.strShadercombineScreenSpace.Trim();
else
- str = s.m_shadercombine.Trim();
+ str = s.strShadercombine.Trim();
CAtlList<CString> sl;
if(!str.IsEmpty()) Explode(str, sl, '|');
@@ -105,9 +105,9 @@ void CShaderCombineDlg::OnOK() }
if (m_bScreenSpace)
- AfxGetAppSettings().m_shadercombineScreenSpace = Implode(sl, '|');
+ AfxGetAppSettings().strShadercombineScreenSpace = Implode(sl, '|');
else
- AfxGetAppSettings().m_shadercombine = Implode(sl, '|');
+ AfxGetAppSettings().strShadercombine = Implode(sl, '|');
__super::OnOK();
}
|