teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix infinite recursion bug in uncommentSelection()

Browse source
This commit is contained in:
PlutonicOverkill 2017-04-26 15:49:39 +12:00
parent 61e374fdfc
commit 1f699552f7
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/opencs/view/world/scriptedit.cpp
View file

@ -293,9 +293,9 @@ void CSVWorld::ScriptEdit::commentSelection()
begin.movePosition(QTextCursor::StartOfLine); begin.movePosition(QTextCursor::StartOfLine);
end.setPosition(end.selectionEnd()); end.setPosition(end.selectionEnd());
end.movePosition(QTextCursor::StartOfLine); end.movePosition(QTextCursor::EndOfLine);
for (; begin <= end; begin.movePosition(QTextCursor::StartOfLine), begin.movePosition(QTextCursor::Down)) for (; begin < end; begin.movePosition(QTextCursor::StartOfLine), begin.movePosition(QTextCursor::Down))
{ {
begin.insertText(";"); begin.insertText(";");
} }
@ -309,13 +309,15 @@ void CSVWorld::ScriptEdit::uncommentSelection()
begin.movePosition(QTextCursor::StartOfLine); begin.movePosition(QTextCursor::StartOfLine);
end.setPosition(end.selectionEnd()); end.setPosition(end.selectionEnd());
end.movePosition(QTextCursor::StartOfLine); end.movePosition(QTextCursor::EndOfLine);
for (; begin <= end; begin.movePosition(QTextCursor::StartOfLine), begin.movePosition(QTextCursor::Down)) { for (; begin < end; begin.movePosition(QTextCursor::StartOfLine), begin.movePosition(QTextCursor::Down)) {
// loop through line until a nonspace character is reached
begin.select(QTextCursor::LineUnderCursor); begin.select(QTextCursor::LineUnderCursor);
QString line = begin.selectedText(); QString line = begin.selectedText();
if (line.size() == 0)
continue;
// get first nonspace character in line // get first nonspace character in line
int index; int index;
for (index = 0; index != line.size(); ++index) for (index = 0; index != line.size(); ++index)
@ -326,10 +328,11 @@ void CSVWorld::ScriptEdit::uncommentSelection()
if (index != line.size() && line[index] == ';') if (index != line.size() && line[index] == ';')
{ {
// remove the semicolon
line.remove(index, 1); line.remove(index, 1);
// put the line back
begin.insertText(line);
} }
begin.insertText(line);
} }
} }