Commit cebf8d76 authored by Eike Hein's avatar Eike Hein

Merge branch '1.5' into 1.6

parents cd34724f 955d6c8e
Changes since 1.6.2:
* Fixed a crash in parsing IRC color formatting codes.
Changes from Konversation 1.6.1 to 1.6.2:
Konversation 1.6.2 is a hotfix release that fixes an unfortunate severe
crash condition that crept into 1.6.1.
......@@ -116,7 +119,6 @@ releases.
* Fixed a bug causing the "Focus Input Bar" action to be enabled/disabled at
incorrect times.
Changes from 1.5 to 1.5.1:
Konversation 1.5.1 is a maintenance release containing only bug fixes. The
included changes address several minor behavioral defects and a low-risk DoS
......
// This COMMIT number is added to version string to be used as "patch level"
#ifndef COMMIT
#define COMMIT 4912
#define COMMIT 4913
#endif
......@@ -1595,7 +1595,8 @@ QString IRCView::closeToTagString(TextHtmlData* data, const QString& _tag)
}
// reopen relevant tags
ret += openTags(data, i);
if (i > -1)
ret += openTags(data, i);
return ret;
}
......@@ -1603,7 +1604,8 @@ QString IRCView::closeToTagString(TextHtmlData* data, const QString& _tag)
QString IRCView::openTags(TextHtmlData* data, int from)
{
QString ret, tag;
int i = from;
int i = from > -1 ? from : 0;
for ( ; i < data->openHtmlTags.count(); ++i)
{
tag = data->openHtmlTags.at(i);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment