Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-18 11:39:31 +01:00
Code Issues Releases Wiki Activity

Fix QRegularExpressionMatch in FMPSParser

Browse Source
This commit is contained in:
Jonas Kvinge 2020-07-18 05:02:34 +02:00
parent b84c70e811
commit 7af64b0782
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/libstrawberry-tagreader/fmpsparser.cpp
View File

@ -92,14 +92,14 @@ bool FMPSParser::Parse(const QString &data) {
int FMPSParser::ParseValueRef(const QStringRef& data, QVariant* ret) const { int FMPSParser::ParseValueRef(const QStringRef& data, QVariant* ret) const {
// Try to match a float // Try to match a float
QRegularExpressionMatch re_match = float_re_.match(*data.string(), data.position()); QRegularExpressionMatch re_match = float_re_.match(*data.string(), data.position());
if (re_match.captured() == data.position()) { if (re_match.capturedStart() == data.position()) {
*ret = re_match.captured(1).toDouble(); *ret = re_match.captured(1).toDouble();
return re_match.capturedLength(); return re_match.capturedLength();
} }
// Otherwise try to match a string // Otherwise try to match a string
re_match = string_re_.match(*data.string(), data.position()); re_match = string_re_.match(*data.string(), data.position());
if (re_match.captured() == data.position()) { if (re_match.capturedStart() == data.position()) {
// Replace escape sequences with their actual characters // Replace escape sequences with their actual characters
QString value = re_match.captured(1); QString value = re_match.captured(1);
value.replace(escape_re_, "\\1"); value.replace(escape_re_, "\\1");