full frame selection fix

nyanpasu64 · May 28, 2018 · 8885d93 · 8885d93
1 parent 120ee4b
commit 8885d93
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/FrameEditor.cpp b/Source/FrameEditor.cpp
@@ -769,7 +769,7 @@ void CFrameEditor::OnLButtonDown(UINT nFlags, CPoint point)
 	m_ButtonPoint = point;
 	m_LastClickPos = TranslateFramePos(point, false);		// // //
 
-	if (auto pSel = model_->GetSelection()) {
+	if (auto *pSel = model_->GetSelection()) {
 		if (model_->IsFrameSelected(m_LastClickPos.m_iFrame) && model_->IsChannelSelected(m_LastClickPos.m_iChannel))		// // //
 			m_bStartDrag = true;
 		else if (nFlags & MK_SHIFT) {

diff --git a/Source/FrameEditorModel.cpp b/Source/FrameEditorModel.cpp
@@ -122,7 +122,7 @@ void CFrameEditorModel::ContinueFrameSelection(int frame) {
 	if (IsSelecting()) {
 		CSongView *pSongView = view_->GetSongView();
 		selStart_.m_iChannel = 0;
-		selEnd_ = {frame, (int)pSongView->GetChannelOrder().GetChannelCount()};
+		selEnd_ = {frame, static_cast<int>(pSongView->GetChannelOrder().GetChannelCount()) - 1};
 		Select(CFrameSelection::Including(selStart_, selEnd_));
 	}
 }