Merge remote-tracking branch 'upstream/master'

1 files changed, 13 insertions, 4 deletions

diff --git a/tools/scaninc/c_file.cpp b/tools/scaninc/c_file.cpp
index f7acc833f..d470f959d 100644
--- a/tools/scaninc/c_file.cpp
+++ b/tools/scaninc/c_file.cpp
@@ -244,18 +244,27 @@ void CFile::CheckIncbin()
 
     m_pos++;
 
-    SkipWhitespace();
+    while (true)
+    {
+        SkipWhitespace();
 
-    std::string path = ReadPath();
+        std::string path = ReadPath();
 
-    SkipWhitespace();
+        SkipWhitespace();
+
+        m_incbins.emplace(path);
+
+        if (m_buffer[m_pos] != ',')
+            break;
+
+        m_pos++;
+    }
 
     if (m_buffer[m_pos] != ')')
         FATAL_INPUT_ERROR("expected ')'");
 
     m_pos++;
 
-    m_incbins.emplace(path);
 }
 
 std::string CFile::ReadPath()