Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Libraries
KOpeningHours
Commits
363cd007
Commit
363cd007
authored
Mar 18, 2021
by
David Faure
Browse files
Fix crash in my recently-added autocorrect check
parent
26569483
Pipeline
#54808
passed with stage
in 23 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
autotests/parsertest.cpp
View file @
363cd007
...
...
@@ -86,6 +86,7 @@ private Q_SLOTS:
T
(
"Mar 01-Mar Su[-2] Mo 17:00-18:00; PH off"
);
T
(
"Oct Su[-1]-Dec 31 08:00-18:00"
);
T
(
"Oct Su[-1]-Dec 31 Su 08:00-18:00"
);
T
(
"Mar Su[1]-Oct Su[1]: 11:00-20:00; PH 11:00-20:00"
);
// from https://wiki.openstreetmap.org/wiki/Key:opening_hours#Simple_examples
T
(
"Mo-Fr 08:00-17:30"
);
...
...
src/lib/openinghours.cpp
View file @
363cd007
...
...
@@ -107,7 +107,7 @@ void OpeningHoursPrivate::autocorrect()
else
if
(
rule
->
selectorCount
()
==
prevRule
->
selectorCount
()
&&
rule
->
m_timeSelector
&&
prevRule
->
m_timeSelector
&&
rule
->
selectorCount
()
==
2
&&
rule
->
m_weekdaySelector
&&
rule
->
selectorCount
()
==
2
&&
rule
->
m_weekdaySelector
&&
prevRule
->
m_weekdaySelector
// slower than writing an operator==, but so much easier to write :)
&&
rule
->
m_weekdaySelector
->
toExpression
()
==
prevRule
->
m_weekdaySelector
->
toExpression
()
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment