changeset 2549:b0131c75604a draft

Merge pull request #1283 from laanwj/2012_05_prevent_tooltip_infiniteloop Prevent tooltip filter from ever causing infinite loops
author Wladimir J. van der Laan <laanwj@gmail.com>
date Sun, 13 May 2012 13:04:20 -0700
parents c7049fd91250 (current diff) dfb7a0208d3a (diff)
children 453d84fc6e11
files src/qt/guiutil.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -257,7 +257,7 @@
     {
         QWidget *widget = static_cast<QWidget*>(obj);
         QString tooltip = widget->toolTip();
-        if(!Qt::mightBeRichText(tooltip) && tooltip.size() > size_threshold)
+        if(tooltip.size() > size_threshold && !tooltip.startsWith("<qt/>") && !Qt::mightBeRichText(tooltip))
         {
             // Prefix <qt/> to make sure Qt detects this as rich text
             // Escape the current message as HTML and replace \n by <br>