Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'testing' into dev

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2021-02-23 21:14:48 +01:00
parent 2560b4d336 fe04c1af25
commit 320643d2da
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1 -1
View File
@@ -225,7 +225,7 @@ _These Release Notes also include the changes from 1.1 RC 1._
**Bugfixes** **Bugfixes**
* A `None` check in the details panel below the project tree was missing, resulting in an * A `None` check in the details panel below the project tree was missing, resulting in an
occasional error message being printed to the logging output. The error was otherwise handles, so occasional error message being printed to the logging output. The error was otherwise handled, so
this is mainly a fix to prevent the error message. PR #639. this is mainly a fix to prevent the error message. PR #639.
**User Interface** **User Interface**
nw/core/index.py
+11 -3
View File
@@ -469,9 +469,17 @@ class NWIndex():
return False return False
sTitle = "T%06d" % nTitle sTitle = "T%06d" % nTitle
if sTitle in self._refIndex[tHandle] and theBits[0] != nwKeyWords.TAG_KEY: if sTitle not in self._refIndex[tHandle]:
for aVal in theBits[1:]: return False
self._refIndex[tHandle][sTitle]["tags"].append([nLine, theBits[0], aVal])
if theBits[0] == nwKeyWords.TAG_KEY:
return False
if theBits[0] not in nwKeyWords.VALID_KEYS:
return False
for aVal in theBits[1:]:
self._refIndex[tHandle][sTitle]["tags"].append([nLine, theBits[0], aVal])
return True return True