Fix crash when pasting large selections near the rightmost channel (#137

)
nyanpasu64 · May 8, 2019 · dfea2f5 · dfea2f5
1 parent 625589f
commit dfea2f5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/Source/PatternAction.cpp b/Source/PatternAction.cpp
@@ -182,7 +182,10 @@ std::optional<CSelection> CPatternAction::SetTargetSelection(CPatternEditor *pPa
 				End.m_iColumn = C_EFF4_PARAM2;
 		}
 	}
-
+
+	Start.fixInvalid(*pPatternEditor->m_pDocument);
+	End.fixInvalid(*pPatternEditor->m_pDocument);
+
 	// Construct selection.
 	CSelection newSelection;
 	newSelection.m_cpStart = Start;

diff --git a/Source/PatternEditor.h b/Source/PatternEditor.h
@@ -294,8 +294,9 @@ class CPatternEditor {
 	static const int ROW_HEIGHT;
 
 	// Variables
-private:
+public:
 	CFamiTrackerDoc	 *m_pDocument;
+private:
 	CFamiTrackerView *m_pView;
 
 	// GDI objects

diff --git a/Source/PatternEditorTypes.cpp b/Source/PatternEditorTypes.cpp
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 #include "PatternEditorTypes.h"
 #include "FamiTrackerDoc.h"
+#include <utility>
 
 // CCursorPos /////////////////////////////////////////////////////////////////////
 
@@ -77,6 +78,14 @@ bool CCursorPos::IsValid(int RowCount, int ChannelCount) const		// // //
 	return true;
 }
 
+void CCursorPos::fixInvalid(CFamiTrackerDoc const & document) {
+	auto channel_count = document.GetChannelCount();
+	if (this->m_iChannel >= channel_count) {
+		this->m_iChannel = channel_count;
+		this->m_iColumn = C_EFF4_PARAM2;
+	}
+}
+
 // CSelection /////////////////////////////////////////////////////////////////////
 
 int CSelection::GetRowStart() const 
@@ -392,25 +401,4 @@ void CPatternIterator::Warp()
 	}
 	while (m_iRow < 0)
 		m_iRow += m_pDocument->GetCurrentPatternLength(m_iTrack, --m_iFrame);
-	//m_iFrame %= m_pDocument->GetFrameCount(m_iTrack);
-	//if (m_iFrame < 0) m_iFrame += m_pDocument->GetFrameCount(m_iTrack);
-}
-
-// CPatternEditorLayout ////////////////////////////////////////////////////////
-/*
-CPatternEditorLayout::CPatternEditorLayout()
-{
 }
-
-void CPatternEditorLayout::SetSize(int Width, int Height)
-{
-//	m_iWinWidth = width;
-//	m_iWinHeight = height - ::GetSystemMetrics(SM_CYHSCROLL);
-}
-
-void CPatternEditorLayout::CalculateLayout()
-{
-	// Calculate pattern layout. Must be called when layout or window size has changed
-
-}
-*/
diff --git a/Source/PatternEditorTypes.h b/Source/PatternEditorTypes.h
@@ -188,6 +188,7 @@ class CCursorPos {
 	bool operator <(const CCursorPos &other) const;
 	bool operator <=(const CCursorPos &other) const;
 	bool IsValid(int RowCount, int ChannelCount) const;		// // //
+	void fixInvalid(CFamiTrackerDoc const & document);
 
 public:
 	int m_iFrame;		// // //