From 34ffa5ab51a5c188672c99a8df6fcb48b91adb33 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 1 Feb 2018 19:31:25 +0200 Subject: [PATCH] Fixed issue #805. Invalid regular expression for validation layout output filename mask. (grafted from eca61caae23937baffec715a2dff88e915dcc302) --HG-- branch : develop --- ChangeLog.txt | 1 + src/app/valentina/dialogs/dialogsavelayout.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index c7c450c15..c8188e64f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -87,6 +87,7 @@ - [#797] Custom seam allowance ignored in some cases. - [#798] Formula Wizard crashes with translated increments. - [#803] Bug in FancyTabBar widget. Wrongly calculated widget width. +- [#805] Invalid regular expression for validation layout output filename mask. # Version 0.5.0 May 9, 2017 - [#581] User can now filter input lists by keyword in function wizard. diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp index 42153856d..07dc5e424 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.cpp +++ b/src/app/valentina/dialogs/dialogsavelayout.cpp @@ -41,7 +41,11 @@ #include #include -const QString baseFilenameRegExp = QStringLiteral("^[\\p{L}\\p{Nd}\\-. _]+$"); +#ifndef Q_OS_WIN + const QString baseFilenameRegExp = QStringLiteral("^[^/]+$"); +#else + const QString baseFilenameRegExp = QStringLiteral("^[^\\:?\"*|/<>]+$"); +#endif bool DialogSaveLayout::havePdf = false; bool DialogSaveLayout::tested = false;