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

[<sag...@us...>]

Revision: 5137
          http://sourceforge.net/p/modplug/code/5137
Author:   saga-games
Date:     2015-05-22 20:33:04 +0000 (Fri, 22 May 2015)
Log Message:
-----------
[Fix] MT2 Loader: Don't assign samples to instruments which already have a VST instrument assigned (fixes souleye - embrace... somewhat)
[Fix] Pattern tab: Properly update pattern list in tree view when inserting a new pattern.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_pat.cpp
    trunk/OpenMPT/soundlib/Load_mt2.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2015-05-22 19:02:20 UTC (rev 5136)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2015-05-22 20:33:04 UTC (rev 5137)
@@ -836,7 +836,7 @@
 		m_OrderList.InvalidateRect(NULL, FALSE);
 		SetCurrentPattern(newPat);
 		m_modDoc.SetModified();
-		m_modDoc.UpdateAllViews(NULL, PatternHint().Names(), this);
+		m_modDoc.UpdateAllViews(NULL, PatternHint(newPat).Names(), this);
 		m_modDoc.UpdateAllViews(NULL, SequenceHint().Data(), this);
 	}
 	SwitchToView();

Modified: trunk/OpenMPT/soundlib/Load_mt2.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mt2.cpp	2015-05-22 19:02:20 UTC (rev 5136)
+++ trunk/OpenMPT/soundlib/Load_mt2.cpp	2015-05-22 20:33:04 UTC (rev 5137)
@@ -997,7 +997,7 @@
 				file.ReadConvertEndianness(groups[grp]);
 			}
 
-			if(mptIns != nullptr)
+			if(mptIns != nullptr && mptIns->nMidiChannel == MidiNoChannel)
 			{
 				for(uint32 note = 0; note < 96; note++)
 				{

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