diff options
author | Underground78 <underground78@users.sourceforge.net> | 2012-04-07 22:31:34 +0400 |
---|---|---|
committer | Underground78 <underground78@users.sourceforge.net> | 2012-04-07 22:31:34 +0400 |
commit | 9aac03425bb778a83f6d45c6130713a1a2e3a676 (patch) | |
tree | 12759e0524911b2db555ff6a0f460389ae1f905e /src | |
parent | 67aa4877ccb95e0d07901a4e82939d0e427724b2 (diff) |
Fix: Prevent the 'Open' dialog from being opened multiple times (for example when double clicking on the tray icon).
This commit fixes ticket #2161.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4283 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
-rw-r--r-- | src/apps/mplayerc/MainFrm.cpp | 6 | ||||
-rw-r--r-- | src/apps/mplayerc/OpenDlg.cpp | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index c643ace49..22aa4f957 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -4206,7 +4206,11 @@ void CMainFrame::OnFileOpenmedia() return;
}
- COpenDlg dlg;
+ static COpenDlg dlg;
+ if (dlg.IsWindowVisible()) {
+ dlg.SetForegroundWindow();
+ return;
+ }
if (dlg.DoModal() != IDOK || dlg.m_fns.GetCount() == 0) {
return;
}
diff --git a/src/apps/mplayerc/OpenDlg.cpp b/src/apps/mplayerc/OpenDlg.cpp index 70358e2ad..2f585c77c 100644 --- a/src/apps/mplayerc/OpenDlg.cpp +++ b/src/apps/mplayerc/OpenDlg.cpp @@ -94,6 +94,12 @@ BOOL COpenDlg::OnInitDialog() m_mrucombo.SetCurSel(0);
}
+ m_fns.RemoveAll();
+ m_path = _T("");
+ m_path2 = _T("");
+ m_fMultipleFiles = false;
+ m_fAppendPlaylist = FALSE;
+
AddAnchor(m_mrucombo, TOP_LEFT, TOP_RIGHT);
AddAnchor(m_mrucombo2, TOP_LEFT, TOP_RIGHT);
AddAnchor(IDC_BUTTON1, TOP_RIGHT);
|