From 30bfeef64a240bc080489431959b7eda77f65751 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 14 Nov 2018 21:44:58 +1100
Subject: [PATCH] corrected merge mistake and improved footage tooltip

---
 io/previewgenerator.cpp |  1 -
 panels/project.cpp      | 33 ++++++++++++++++++---------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/io/previewgenerator.cpp b/io/previewgenerator.cpp
index 7c9e6ce46..842fc5cf5 100644
--- a/io/previewgenerator.cpp
+++ b/io/previewgenerator.cpp
@@ -192,7 +192,6 @@ void PreviewGenerator::finalize_media() {
             item->setText(2, QString::number(media->audio_tracks.at(0)->audio_frequency) + " Hz");
         }
     }
-	}
 }
 
 void PreviewGenerator::generate_waveform() {
diff --git a/panels/project.cpp b/panels/project.cpp
index 6424fb598..d30c349d5 100644
--- a/panels/project.cpp
+++ b/panels/project.cpp
@@ -1644,19 +1644,21 @@ void update_footage_tooltip(QTreeWidgetItem *item, Media *media, QString error)
 			}
 			tooltip += "\n";
 
-			tooltip += "Frame Rate: ";
-			for (int i=0;i<media->video_tracks.size();i++) {
-				if (i > 0) {
-					tooltip += ", ";
-				}
-                if (media->video_tracks.at(i)->video_interlacing == VIDEO_PROGRESSIVE) {
-					tooltip += QString::number(media->video_tracks.at(i)->video_frame_rate);
-				} else {
-					tooltip += QString::number(media->video_tracks.at(i)->video_frame_rate * 2);
-					tooltip += " fields (" + QString::number(media->video_tracks.at(i)->video_frame_rate) + " frames)";
-				}
-			}
-			tooltip += "\n";
+            if (!media->video_tracks.at(0)->infinite_length) {
+                tooltip += "Frame Rate: ";
+                for (int i=0;i<media->video_tracks.size();i++) {
+                    if (i > 0) {
+                        tooltip += ", ";
+                    }
+                    if (media->video_tracks.at(i)->video_interlacing == VIDEO_PROGRESSIVE) {
+                        tooltip += QString::number(media->video_tracks.at(i)->video_frame_rate);
+                    } else {
+                        tooltip += QString::number(media->video_tracks.at(i)->video_frame_rate * 2);
+                        tooltip += " fields (" + QString::number(media->video_tracks.at(i)->video_frame_rate) + " frames)";
+                    }
+                }
+                tooltip += "\n";
+            }
 
 			tooltip += "Interlacing: ";
 			for (int i=0;i<media->video_tracks.size();i++) {
@@ -1664,11 +1666,12 @@ void update_footage_tooltip(QTreeWidgetItem *item, Media *media, QString error)
 					tooltip += ", ";
 				}
 				tooltip += get_interlacing_name(media->video_tracks.at(i)->video_interlacing);
-			}
-			tooltip += "\n";
+            }
 		}
 
 		if (media->audio_tracks.size() > 0) {
+            tooltip += "\n";
+
 			tooltip += "Audio Frequency: ";
 			for (int i=0;i<media->audio_tracks.size();i++) {
 				if (i > 0) {