Merge pull request #6770 from evsh/fix-6768

Do not attempt to show detailed tooltips without torrent metadata. Closes #6768.
8 years ago · a997b7d078
1 changed files with 7 additions and 4 deletions
--- a/src/gui/properties/piecesbar.cpp
+++ b/src/gui/properties/piecesbar.cpp
@ -251,8 +251,8 @@ void PiecesBar::showToolTip(const QHelpEvent *e)
				@@ -251,8 +251,8 @@ void PiecesBar::showToolTip(const QHelpEvent *e)

    QString toolTipText;
    QTextStream stream(&toolTipText, QIODevice::WriteOnly);
-    bool showDetailedInformation = QApplication::keyboardModifiers().testFlag(Qt::ShiftModifier);
-    if (showDetailedInformation) {
+    const bool showDetailedInformation = QApplication::keyboardModifiers().testFlag(Qt::ShiftModifier);
+    if (showDetailedInformation && m_torrent->hasMetadata()) {
        const int imagePos = e->pos().x() - borderWidth;
        if ((imagePos >=0) && (imagePos < m_image.width())) {
            stream << "<html><body>";
@ -286,7 +286,10 @@ void PiecesBar::showToolTip(const QHelpEvent *e)
				@@ -286,7 +286,10 @@ void PiecesBar::showToolTip(const QHelpEvent *e)
    }
    else {
        stream << simpleToolTipText();
-        stream << '\n' << tr("Hold Shift key for detailed information");
+        if (showDetailedInformation) // metadata are not available at this point
+            stream << '\n' << tr("Wait until metadata become available to see detailed information");
+        else
+            stream << '\n' << tr("Hold Shift key for detailed information");
    }

    stream.flush();
@ -296,7 +299,7 @@ void PiecesBar::showToolTip(const QHelpEvent *e)
				@@ -296,7 +299,7 @@ void PiecesBar::showToolTip(const QHelpEvent *e)

 void PiecesBar::highlightFile(int imagePos)
 {
-    if (!m_torrent || (imagePos < 0) || (imagePos >= m_image.width()))
+    if (!m_torrent || !m_torrent->hasMetadata() || (imagePos < 0) || (imagePos >= m_image.width()))
        return;

    PieceIndexToImagePos transform {m_torrent->info(), m_image};