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

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

Revision: 4657
          http://sourceforge.net/p/modplug/code/4657
Author:   saga-games
Date:     2014-12-16 21:49:48 +0000 (Tue, 16 Dec 2014)
Log Message:
-----------
[Fix] Instrument tab was not updated properly after adding the first instrument (http://bugs.openmpt.org/view.php?id=618)
[Mod] OpenMPT: Version is now 1.24.00.23

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2014-12-16 17:53:37 UTC (rev 4656)
+++ trunk/OpenMPT/common/versionNumber.h	2014-12-16 21:49:48 UTC (rev 4657)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               24
 #define VER_MINOR               00
-#define VER_MINORMINOR          22
+#define VER_MINORMINOR          23
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2014-12-16 17:53:37 UTC (rev 4656)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2014-12-16 21:49:48 UTC (rev 4657)
@@ -1476,7 +1476,9 @@
 			}
 
 			SetCurrentInstrument(m_nInstrument);
-			SetModified(InstrumentHint().Info().Envelope().Names(), true);
+			InstrumentHint hint = InstrumentHint().Info().Envelope().Names();
+			if(bFirst) hint.ModType();
+			SetModified(hint, true);
 		} else bOk = FALSE;
 	}
 	SampleHint hint = SampleHint().Info().Data().Names();
@@ -1512,10 +1514,16 @@
 
 	cs.Leave();
 
-	SetModified(InstrumentHint().Info().Envelope().Names(), true);
-	SampleHint hint = SampleHint().Info().Data().Names();
-	if (bFirst) hint.ModType();
-	m_modDoc.UpdateAllViews(nullptr, hint, this);
+	{
+		InstrumentHint hint = InstrumentHint().Info().Envelope().Names();
+		if (bFirst) hint.ModType();
+		SetModified(hint, true);
+	}
+	{
+		SampleHint hint = SampleHint().Info().Data().Names();
+		if (bFirst) hint.ModType();
+		m_modDoc.UpdateAllViews(nullptr, hint, this);
+	}
 	EndWaitCursor();
 	return TRUE;
 }

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