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/PPageWebServer.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/PPageWebServer.cpp')
| -rw-r--r-- | src/apps/mplayerc/PPageWebServer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/apps/mplayerc/PPageWebServer.cpp b/src/apps/mplayerc/PPageWebServer.cpp index 2f0749259..0b3ba27bf 100644 --- a/src/apps/mplayerc/PPageWebServer.cpp +++ b/src/apps/mplayerc/PPageWebServer.cpp @@ -100,11 +100,11 @@ BOOL CPPageWebServer::OnInitDialog() m_fWebServerPrintDebugInfo = s.fWebServerPrintDebugInfo;
m_fWebServerLocalhostOnly = s.fWebServerLocalhostOnly;
m_fWebServerUseCompression = s.fWebServerUseCompression;
- m_fWebRoot = s.WebRoot.Find('*') < 0;
- m_WebRoot = s.WebRoot;
+ m_fWebRoot = s.strWebRoot.Find('*') < 0;
+ m_WebRoot = s.strWebRoot;
m_WebRoot.TrimLeft(_T("*"));
- m_WebDefIndex = s.WebDefIndex;
- m_WebServerCGI = s.WebServerCGI;
+ m_WebDefIndex = s.strWebDefIndex;
+ m_WebServerCGI = s.strWebServerCGI;
UpdateData(FALSE);
@@ -124,16 +124,16 @@ BOOL CPPageWebServer::OnApply() if(!m_fWebRoot) NewWebRoot = _T("*") + NewWebRoot;
bool fRestart = s.nWebServerPort != m_nWebServerPort
- || s.WebRoot != NewWebRoot || s.WebServerCGI != m_WebServerCGI;
+ || s.strWebRoot != NewWebRoot || s.strWebServerCGI != m_WebServerCGI;
s.fEnableWebServer = !!m_fEnableWebServer;
s.nWebServerPort = m_nWebServerPort;
s.fWebServerPrintDebugInfo = !!m_fWebServerPrintDebugInfo;
s.fWebServerLocalhostOnly = !!m_fWebServerLocalhostOnly;
s.fWebServerUseCompression = !!m_fWebServerUseCompression;
- s.WebRoot = NewWebRoot;
- s.WebDefIndex = m_WebDefIndex;
- s.WebServerCGI = m_WebServerCGI;
+ s.strWebRoot = NewWebRoot;
+ s.strWebDefIndex = m_WebDefIndex;
+ s.strWebServerCGI = m_WebServerCGI;
if(CMainFrame* pWnd = (CMainFrame*)AfxGetMainWnd())
{
|