diff options
| -rw-r--r-- | docs/Changelog.txt | 4 | ||||
| -rw-r--r-- | src/apps/mplayerc/PPagePlayer.cpp | 19 | ||||
| -rw-r--r-- | src/apps/mplayerc/PPagePlayer.h | 1 |
3 files changed, 10 insertions, 14 deletions
diff --git a/docs/Changelog.txt b/docs/Changelog.txt index 63fa6ad1f..54459b034 100644 --- a/docs/Changelog.txt +++ b/docs/Changelog.txt @@ -12,7 +12,7 @@ Legend: ==============================
* Ticket #734, An unicode encoding will now be used for the ini file. Old ASCII
ini files will be automatically converted to unicode. Favorites with unicode
- filenames are now correctly handled when using an ini file.
+ filenames are now correctly handled when using an ini file
* Ticket #1733/#2029, Include subfolders when opening a folder using the command
line and by extension the explorer context menu
* Reduced the maximum number of packets in the Queue, except for AVI. This will
@@ -29,3 +29,5 @@ Legend: ! Ticket #2133, Javascript error in "player.html"
! Ticket #2137, Disable animation when pressing the "Boss" key
! Ticket #2156, Decoder must deliver all the output data at the end of stream
+! The settings location is now changed only when applying the changes in the
+ options dialog instead of immediately after changing the state of the checkbox
diff --git a/src/apps/mplayerc/PPagePlayer.cpp b/src/apps/mplayerc/PPagePlayer.cpp index 5ddb805c5..9e86be926 100644 --- a/src/apps/mplayerc/PPagePlayer.cpp +++ b/src/apps/mplayerc/PPagePlayer.cpp @@ -79,7 +79,6 @@ void CPPagePlayer::DoDataExchange(CDataExchange* pDX) }
BEGIN_MESSAGE_MAP(CPPagePlayer, CPPageBase)
- ON_BN_CLICKED(IDC_CHECK8, OnBnClickedCheck8)
ON_UPDATE_COMMAND_UI(IDC_CHECK13, OnUpdateCheck13)
ON_UPDATE_COMMAND_UI(IDC_DVD_POS, OnUpdatePos)
ON_UPDATE_COMMAND_UI(IDC_FILE_POS, OnUpdatePos)
@@ -102,7 +101,7 @@ BOOL CPPagePlayer::OnInitDialog() m_fRememberWindowSize = s.fRememberWindowSize;
m_fSavePnSZoom = s.fSavePnSZoom;
m_fSnapToDesktopEdges = s.fSnapToDesktopEdges;
- m_fUseIni = ((CMPlayerCApp*)AfxGetApp())->IsIniValid();
+ m_fUseIni = AfxGetMyApp()->IsIniValid();
m_fKeepHistory = s.fKeepHistory;
m_fHideCDROMsSubMenu = s.fHideCDROMsSubMenu;
m_priority = s.dwPriority != NORMAL_PRIORITY_CLASS;
@@ -154,6 +153,11 @@ BOOL CPPagePlayer::OnApply() s.MRUDub.WriteList();
}
+ // Check if the settings location need to be changed
+ if (AfxGetMyApp()->IsIniValid() != !!m_fUseIni) {
+ AfxGetMyApp()->ChangeSettingsLocation(!!m_fUseIni);
+ }
+
((CMainFrame*)AfxGetMainWnd())->ShowTrayIcon(s.fTrayIcon);
::SetPriorityClass(::GetCurrentProcess(), s.dwPriority);
@@ -164,15 +168,6 @@ BOOL CPPagePlayer::OnApply() return __super::OnApply();
}
-void CPPagePlayer::OnBnClickedCheck8()
-{
- UpdateData();
-
- AfxGetMyApp()->ChangeSettingsLocation(!!m_fUseIni);
-
- SetModified();
-}
-
void CPPagePlayer::OnUpdateCheck13(CCmdUI* pCmdUI)
{
UpdateData();
@@ -184,5 +179,5 @@ void CPPagePlayer::OnUpdatePos(CCmdUI* pCmdUI) {
UpdateData();
- pCmdUI->Enable( !!m_fKeepHistory );
+ pCmdUI->Enable(!!m_fKeepHistory);
}
diff --git a/src/apps/mplayerc/PPagePlayer.h b/src/apps/mplayerc/PPagePlayer.h index 03ad72e68..a778fa578 100644 --- a/src/apps/mplayerc/PPagePlayer.h +++ b/src/apps/mplayerc/PPagePlayer.h @@ -65,7 +65,6 @@ protected: DECLARE_MESSAGE_MAP()
public:
- afx_msg void OnBnClickedCheck8();
afx_msg void OnUpdateTimeout(CCmdUI* pCmdUI);
afx_msg void OnUpdateCheck13(CCmdUI* pCmdUI);
afx_msg void OnUpdatePos(CCmdUI* pCmdUI);
|