[Fix] Sample tab: Fix crash when replacing a sample with a shorter one while outside of the sample editor, and then returning to the same sample slot (https://bugs.openmpt.org/view.php?id=1866).

git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22973 56274372-70c3-4bfc-bfc3-4c3a0b034d27

Author: sagamusix

mptrack/Globals.cpp

@@ -801,8 +801,12 @@ void CModScrollView::SetScrollSizes(int nMapMode, SIZE sizeTotal, const SIZE& si
 	SCROLLINFO info;
 	if(GetScrollInfo(SB_HORZ, &info, SIF_POS))
 		m_nScrollPosX = info.nPos;
+	else
+		m_nScrollPosX = 0;
 	if(GetScrollInfo(SB_VERT, &info, SIF_POS))
 		m_nScrollPosY = info.nPos;
+	else
+		m_nScrollPosY = 0;
 }
 
 

mptrack/View_smp.cpp

@@ -1001,10 +1001,10 @@ void CViewSample::OnDraw(CDC *pDC)
 
 	const CRect rcClient = m_rcClient;
 	CRect rect, rc;
-	const SmpLength smpScrollPos = ScrollPosToSamplePos();
 	const auto &colors = TrackerSettings::Instance().rgbCustomColors;
 	const CSoundFile &sndFile = pModDoc->GetSoundFile();
 	const ModSample &sample = sndFile.GetSample((m_nSample <= sndFile.GetNumSamples()) ? m_nSample : 0);
+	const SmpLength smpScrollPos = std::min(ScrollPosToSamplePos(), sample.nLength);
 	if(sample.uFlags[CHN_ADLIB])
 	{
 		CModScrollView::OnDraw(pDC);