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

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

Revision: 4731
          http://sourceforge.net/p/modplug/code/4731
Author:   saga-games
Date:     2015-01-23 22:47:51 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
[Imp] Sample tab: If necessary, "center loop x" shortcuts automatically zoom into the sample.
[Fix] Keyboard config dialog: It was possible to accidentally click the conflict message box away, making the dialog partially unusable.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
    trunk/OpenMPT/mptrack/View_smp.cpp

Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	2015-01-23 19:13:33 UTC (rev 4730)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	2015-01-23 22:47:51 UTC (rev 4731)
@@ -773,7 +773,7 @@
 	if((conflictCmd = plocalCmdSet->IsConflicting(kc, cmd)).first != kcNull
 		&& conflictCmd.first != cmd
 		&& !plocalCmdSet->IsCrossContextConflict(kc, conflictCmd.second)
-		&& Reporting::Confirm("New shortcut (" + kc.GetKeyText() + ") conflicts with " + plocalCmdSet->GetCommandText(conflictCmd.first) + " in " + conflictCmd.second.GetContextText() + ".\nDelete the other shortcut and keep the new one?", "Shortcut Conflict") == cnfNo)
+		&& Reporting::Confirm("New shortcut (" + kc.GetKeyText() + ") conflicts with " + plocalCmdSet->GetCommandText(conflictCmd.first) + " in " + conflictCmd.second.GetContextText() + ".\nDelete the other shortcut and keep the new one?", "Shortcut Conflict", false, this) == cnfNo)
 	{
 		// Restore original choice
 		add = false;

Modified: trunk/OpenMPT/mptrack/View_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp	2015-01-23 19:13:33 UTC (rev 4730)
+++ trunk/OpenMPT/mptrack/View_smp.cpp	2015-01-23 22:47:51 UTC (rev 4731)
@@ -2932,7 +2932,6 @@
 		case kcSampleCenterLoopEnd:
 		case kcSampleCenterSustainStart:
 		case kcSampleCenterSustainEnd:
-			if(m_nZoom)
 			{
 				SmpLength point = 0;
 				ModSample &sample = sndFile.GetSample(m_nSample);
@@ -2943,7 +2942,10 @@
 				case kcSampleCenterSustainStart:	point = sample.nSustainStart; break;
 				case kcSampleCenterSustainEnd:		point = sample.nSustainEnd; break;
 				}
-				ScrollToSample(point);
+				if(!m_nZoom)
+					SetZoom(1, point);
+				else
+					ScrollToSample(point);
 			}
 			return wParam;
 		case kcPrevInstrument:	OnPrevInstrument(); return wParam;

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