From b039bee067f231234d5fef2f0e75c35be4735500 Mon Sep 17 00:00:00 2001
From: Waldi Ravens <wr86420@gmail.com>
Date: Wed, 16 Dec 2015 10:17:46 +0100
Subject: [PATCH 1/2] Fixed ShowTip method (Forms/Compare)

---
 src/Forms/Compare.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Forms/Compare.cs b/src/Forms/Compare.cs
index b2027a4d6..047f58dfc 100644
--- a/src/Forms/Compare.cs
+++ b/src/Forms/Compare.cs
@@ -827,10 +827,18 @@ namespace Nikse.SubtitleEdit.Forms
 
         private void ShowTip(Control control)
         {
-            string sub1Path = control.Text;
-            if (!string.IsNullOrEmpty(sub1Path))
+            var text = control.Text;
+            if (!string.IsNullOrEmpty(text))
             {
-                toolTip1.Show(Path.GetFileName(sub1Path), control);
+                try
+                {
+                    text = Path.GetFileName(text);
+                }
+                catch
+                {
+                    // not a path
+                }
+                toolTip1.Show(text, control);
             }
         }
 

From b08dcc530f336f45eb0ea4a1190673c4f0409071 Mon Sep 17 00:00:00 2001
From: Waldi Ravens <wr86420@gmail.com>
Date: Wed, 16 Dec 2015 13:53:49 +0100
Subject: [PATCH 2/2] Don't let multiline label hide top of subtitleListView
 (Forms/Compare)

---
 src/Forms/Compare.Designer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Forms/Compare.Designer.cs b/src/Forms/Compare.Designer.cs
index 085a39d17..3eb705221 100644
--- a/src/Forms/Compare.Designer.cs
+++ b/src/Forms/Compare.Designer.cs
@@ -309,8 +309,8 @@ namespace Nikse.SubtitleEdit.Forms
             this.Controls.Add(this.buttonOpenSubtitle2);
             this.Controls.Add(this.buttonOpenSubtitle1);
             this.Controls.Add(this.buttonOK);
-            this.Controls.Add(this.labelSubtitle2);
             this.Controls.Add(this.subtitleListView2);
+            this.Controls.Add(this.labelSubtitle2);
             this.Controls.Add(this.subtitleListView1);
             this.Controls.Add(this.labelSubtitle1);
             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));