[FarGroup/FarManager] master: Correction of 6030 (e070822ee)

[farg...@farmanager.com]

Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/e070822ee8cb24aa35b0d806abe591a389692436

>---------------------------------------------------------------

commit e070822ee8cb24aa35b0d806abe591a389692436
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Sun Oct 2 21:17:12 2022 +0100

Correction of 6030


>---------------------------------------------------------------

e070822ee8cb24aa35b0d806abe591a389692436
far/changelog | 5 +++++
far/filemasks.cpp | 7 +++++--
far/vbuild.m4 | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/far/changelog b/far/changelog
index 29524ba9f..00f23b32c 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 02.10.2022 21:16:49 +0100 - build 6031
+
+1. Correction of 6030.
+
--------------------------------------------------------------------------------
drkns 02.10.2022 19:29:07 +0100 - build 6030

diff --git a/far/filemasks.cpp b/far/filemasks.cpp
index bd2aed9cb..32a65f8d0 100644
--- a/far/filemasks.cpp
+++ b/far/filemasks.cpp
@@ -362,6 +362,8 @@ bool filemasks::masks::assign(string&& Masks, DWORD Flags)
}
catch (regex_exception const& e)
{
+ m_Masks.emplace<0>(); // Make it empty
+
if (!(Flags & FMF_SILENT))
{
ReCompileErrorMessage(e, Masks);
@@ -397,9 +399,10 @@ bool filemasks::masks::empty() const
{
return Data.empty();
},
- [](const regex_data& Data)
+ [](const regex_data&)
{
- return Data.Match.empty();
+ // It holds regex_data only when compilation is successful
+ return false;
}
}, m_Masks);
}
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 3ce941c9e..b9b885ab0 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6030
+6031