Merge pull request #87 from gregory38/multiple-line-errors

glsl edit: grep multiline error/warning messages

1 files changed, 8 insertions, 0 deletions

diff --git a/gui/retracer.cpp b/gui/retracer.cpp
index 69dca6c6..bbe638ca 100644
--- a/gui/retracer.cpp
+++ b/gui/retracer.cpp
@@ -406,6 +406,14 @@ void Retracer::run()
             error.type = regexp.cap(2);
             error.message = regexp.cap(3);
             errors.append(error);
+        } else if (!errors.isEmpty()) {
+            // Probably a multiligne message
+            ApiTraceError &previous = errors.last();
+            if (line.endsWith("\n")) {
+                line.chop(1);
+            }
+            previous.message.append('\n');
+            previous.message.append(line);
         }
     }