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/PPageLogo.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/PPageLogo.cpp')
| -rw-r--r-- | src/apps/mplayerc/PPageLogo.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/apps/mplayerc/PPageLogo.cpp b/src/apps/mplayerc/PPageLogo.cpp index 6eaf8d804..e8f03102c 100644 --- a/src/apps/mplayerc/PPageLogo.cpp +++ b/src/apps/mplayerc/PPageLogo.cpp @@ -72,15 +72,15 @@ BOOL CPPageLogo::OnInitDialog() AppSettings& s = AfxGetAppSettings();
- m_intext = s.logoext?1:0;
- m_logofn = s.logofn;
+ m_intext = s.fLogoExternal?1:0;
+ m_logofn = s.strLogoFileName;
UpdateData(FALSE);
m_logoidpos = m_logoids.GetHeadPosition();
for(POSITION pos = m_logoids.GetHeadPosition(); pos; m_logoids.GetNext(pos))
{
- if(m_logoids.GetAt(pos) == s.logoid)
+ if(m_logoids.GetAt(pos) == s.nLogoId)
{
m_logoidpos = pos;
break;
@@ -100,9 +100,9 @@ BOOL CPPageLogo::OnApply() AppSettings& s = AfxGetAppSettings();
- s.logoext = !!m_intext;
- s.logofn = m_logofn;
- s.logoid = m_logoids.GetAt(m_logoidpos);
+ s.fLogoExternal = !!m_intext;
+ s.strLogoFileName = m_logofn;
+ s.nLogoId = m_logoids.GetAt(m_logoidpos);
((CMainFrame*)AfxGetMainWnd())->m_wndView.LoadLogo();
|