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

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

Revision: 4199
          http://sourceforge.net/p/modplug/code/4199
Author:   saga-games
Date:     2014-07-31 11:32:15 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
[Fix] After loading a new keybinding file, effect keys were no longer working until the user switched to a module with different effect keys (tx stinkbug).
[Mod] OpenMPT: Version is now 1.23.04.06

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

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2014-07-30 13:55:15 UTC (rev 4198)
+++ trunk/OpenMPT/common/versionNumber.h	2014-07-31 11:32:15 UTC (rev 4199)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               23
 #define VER_MINOR               04
-#define VER_MINORMINOR          05
+#define VER_MINORMINOR          06
 
 //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/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp	2014-07-30 13:55:15 UTC (rev 4198)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp	2014-07-31 11:32:15 UTC (rev 4199)
@@ -1437,6 +1437,7 @@
 //-----------------------------------------
 {
 	// copy constructors should take care of complexity (I hope)
+	oldSpecs = nullptr;
 	for (size_t cmd = 0; cmd < CountOf(commands); cmd++)
 		commands[cmd] = source->commands[cmd];
 }
@@ -1509,6 +1510,7 @@
 	int commentStart;
 	int l=0;
 	int fileVersion = 0;
+	oldSpecs = nullptr;	// After clearing the key set, need to fix effect letters
 
 	bool fillExistingSet = commandSet != nullptr;
 

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