diff --git a/LameXP.vcproj b/LameXP.vcproj index 21699844..b7fe0aa3 100644 --- a/LameXP.vcproj +++ b/LameXP.vcproj @@ -106,6 +106,7 @@ > diff --git a/etc/Utilities/AutoInc.exe b/etc/Utilities/AutoInc.exe new file mode 100644 index 00000000..563290a3 Binary files /dev/null and b/etc/Utilities/AutoInc.exe differ diff --git a/src/Config.h b/src/Config.h index ddb10c56..5dce7411 100644 --- a/src/Config.h +++ b/src/Config.h @@ -25,7 +25,7 @@ #define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 0 -#define VER_LAMEXP_BUILD 12 +#define VER_LAMEXP_BUILD 17 #define VER_LAMEXP_SUFFIX TechPreview /* diff --git a/src/Thread_FileAnalyzer.cpp b/src/Thread_FileAnalyzer.cpp index dc19271e..ac3a6853 100644 --- a/src/Thread_FileAnalyzer.cpp +++ b/src/Thread_FileAnalyzer.cpp @@ -321,22 +321,28 @@ unsigned int FileAnalyzer::parseDuration(const QString &str) { QTime time; + time = QTime::fromString(str, "z'ms'"); + if(time.isValid()) + { + return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second()); + } + time = QTime::fromString(str, "s's 'z'ms'"); if(time.isValid()) { - return (time.hour() * 60 * 60) + (time.minute() * 60) + time.second(); + return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second()); } time = QTime::fromString(str, "m'mn 's's'"); if(time.isValid()) { - return (time.hour() * 60 * 60) + (time.minute() * 60) + time.second(); + return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second()); } time = QTime::fromString(str, "h'h 'm'mn'"); if(time.isValid()) { - return (time.hour() * 60 * 60) + (time.minute() * 60) + time.second(); + return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second()); } return 0;