From: Toni Wilen <twilen@winuae.net>
Date: Sat, 25 Aug 2018 19:33:09 +0000 (+0300)
Subject: Main play loop may never be entered in some situations, make sure cdda_pos is set.
X-Git-Tag: 4100~98
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=32adada33c41e51e3445d922707ae9768f63a7ba;p=francis%2Fwinuae.git

Main play loop may never be entered in some situations, make sure cdda_pos is set.
---

diff --git a/blkdev_cdimage.cpp b/blkdev_cdimage.cpp
index ea8ebe32..fe772cf8 100644
--- a/blkdev_cdimage.cpp
+++ b/blkdev_cdimage.cpp
@@ -464,7 +464,7 @@ static void next_cd_audio_buffer_callback(int bufnum)
 
 static bool cdda_play_func2 (struct cdunit *cdu, int *outpos)
 {
-	int cdda_pos;
+	int cdda_pos = cdu->cdda_start;
 	int bufnum;
 	int oldplay;
 	int idleframes = 0;
diff --git a/od-win32/blkdev_win32_ioctl.cpp b/od-win32/blkdev_win32_ioctl.cpp
index d6319b0d..19006063 100644
--- a/od-win32/blkdev_win32_ioctl.cpp
+++ b/od-win32/blkdev_win32_ioctl.cpp
@@ -505,7 +505,7 @@ void ioctl_next_cd_audio_buffer_callback(int bufnum)
 
 static bool cdda_play2 (struct dev_info_ioctl *ciw, int *outpos)
 {
-	int cdda_pos;
+	int cdda_pos = ciw->cdda_start;
 	int bufnum;
 	int buffered;
 	int i;