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/PPageFullscreen.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/PPageFullscreen.cpp')
-rw-r--r-- | src/apps/mplayerc/PPageFullscreen.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/apps/mplayerc/PPageFullscreen.cpp b/src/apps/mplayerc/PPageFullscreen.cpp index dcd759229..b74adf5b8 100644 --- a/src/apps/mplayerc/PPageFullscreen.cpp +++ b/src/apps/mplayerc/PPageFullscreen.cpp @@ -93,10 +93,10 @@ BOOL CPPageFullscreen::OnInitDialog() AppSettings& s = AfxGetAppSettings();
- m_launchfullscreen = s.launchfullscreen;
+ m_launchfullscreen = s.fLaunchfullscreen;
m_AutoChangeFullscrRes = s.AutoChangeFullscrRes;
m_fSetDefault = s.AutoChangeFullscrRes.bApplyDefault;
- m_f_hmonitor = s.f_hmonitor;
+ m_f_hmonitor = s.strFullScreenMonitor;
m_iShowBarsWhenFullScreen = s.fShowBarsWhenFullScreen;
m_nShowBarsWhenFullScreenTimeOut = s.nShowBarsWhenFullScreenTimeOut;
m_nTimeOutCtrl.SetRange(-1, 10);
@@ -184,8 +184,8 @@ BOOL CPPageFullscreen::OnApply() }
m_AutoChangeFullscrRes.bApplyDefault = m_fSetDefault;
s.AutoChangeFullscrRes = m_AutoChangeFullscrRes;
- s.launchfullscreen = !!m_launchfullscreen;
- s.f_hmonitor = m_f_hmonitor;
+ s.fLaunchfullscreen = !!m_launchfullscreen;
+ s.strFullScreenMonitor = m_f_hmonitor;
s.fShowBarsWhenFullScreen = !!m_iShowBarsWhenFullScreen;
s.nShowBarsWhenFullScreenTimeOut = m_nShowBarsWhenFullScreenTimeOut;
s.fExitFullScreenAtTheEnd = !!m_fExitFullScreenAtTheEnd;
@@ -239,7 +239,7 @@ void CPPageFullscreen::OnUpdateFullScrCombo() {
CMonitors monitors;
m_f_hmonitor = m_MonitorDisplayNames[m_iMonitorTypeCtrl.GetCurSel()];
- if(AfxGetAppSettings().f_hmonitor != m_f_hmonitor) m_AutoChangeFullscrRes.bEnabled = false;
+ if(AfxGetAppSettings().strFullScreenMonitor != m_f_hmonitor) m_AutoChangeFullscrRes.bEnabled = false;
ModesUpdate();
SetModified();
}
|