[OMPT-svn-commit] SF.net SVN: modplug:[448] trunk/OpenMPT/mptrack

[<rel...@us...>]

Revision: 448
          http://modplug.svn.sourceforge.net/modplug/?rev=448&view=rev
Author:   relabsoluness
Date:     2009-12-23 13:43:29 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
[Fix] GUI: Shift key erroneously opened MIDI mapping dialog in some cases (appeared in rev. 344).
[Fix] GUI: Multiselection was partly broken in load dialogs (appeared in rev. 444).
[Fix] Orderlist: Follow song keyshortcut didn't work in this context (appeared in rev. 424).

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_seq.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp	2009-12-21 18:56:25 UTC (rev 447)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp	2009-12-23 13:43:29 UTC (rev 448)
@@ -421,7 +421,8 @@
 		return wParam;
 	case kcChangeLoopStatus:
 		m_pParent->OnModCtrlMsg(CTRLMSG_PAT_LOOP, -1); return wParam;
-	case kcToggleFollowSong: m_pParent->OnFollowSong(); return wParam;
+	case kcToggleFollowSong:
+		m_pParent->OnModCtrlMsg(CTRLMSG_PAT_FOLLOWSONG, 0); return wParam;
 
 	case kcChannelUnmuteAll:
 	case kcUnmuteAllChnOnPatTransition:
@@ -1047,8 +1048,6 @@
 				AppendMenu(menuSequence, MF_STRING, ID_SEQUENCE_ITEM + MAX_SEQUENCES, TEXT("Create new sequence"));
 			if (pSndFile->Order.GetNumSequences() > 1)
 				AppendMenu(menuSequence, MF_STRING, ID_SEQUENCE_ITEM + MAX_SEQUENCES + 1, TEXT("Delete current sequence"));
-
-			::DestroyMenu(menuSequence);
 		}
 	}
 	AppendMenu(hMenu, MF_SEPARATOR, NULL, "");

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2009-12-21 18:56:25 UTC (rev 447)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2009-12-23 13:43:29 UTC (rev 448)
@@ -3307,11 +3307,14 @@
 	if(filterIndex != nullptr)
 		dlg.m_ofn.nFilterIndex = (DWORD)(*filterIndex);
 
-	// TODO is this necessary? Apparently not!
-	/*const size_t bufferSize = 2048; //Note: This is possibly the maximum buffer size in MFC 7(this note was written November 2006).
-	vector<char> filenameBuffer(bufferSize, 0);
-	dlg.GetOFN().lpstrFile = &filenameBuffer[0];
-	dlg.GetOFN().nMaxFile = bufferSize;*/
+	vector<TCHAR> filenameBuffer;
+	if (allowMultiSelect)
+	{
+		const size_t bufferSize = 2048; // Note: This is possibly the maximum buffer size in MFC 7(this note was written November 2006).
+		filenameBuffer.resize(bufferSize, 0);
+		dlg.GetOFN().lpstrFile = &filenameBuffer[0];
+		dlg.GetOFN().nMaxFile = bufferSize;
+	}
 
 	// Do it!
 	CMainFrame::GetInputHandler()->Bypass(true);

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2009-12-21 18:56:25 UTC (rev 447)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2009-12-23 13:43:29 UTC (rev 448)
@@ -669,7 +669,7 @@
 				pModDoc->RecordParamChange(pVstPlugin->GetSlot(), index);
 			}
 
-			if (CMainFrame::GetInputHandler()->ShiftPressed())
+			if (pModDoc && CMainFrame::GetInputHandler()->ShiftPressed() && pVstPlugin->GetEditor() && pVstPlugin->GetEditor()->m_hWnd)
 			{
 				CMainFrame::GetInputHandler()->SetModifierMask(0); // Make sure that the dialog will open only once.
 				CAbstractVstEditor *pVstEditor = pVstPlugin->GetEditor();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.