#
#
# patch "NEWS"
#  from [7a5fe2615f117ae92d242f3e2c72159f85097fe2]
#    to [89d7a8cd576f5a5fba704f8485efbfc95c93ff18]
# 
# patch "src/view/dialogs/FileDiff.cpp"
#  from [d2f5ff9152be8a3ccc332dcf9ca71a8e56aa5535]
#    to [3ca14f49640303a7a64cb0def33be2a4a1a519be]
#
============================================================
--- NEWS	7a5fe2615f117ae92d242f3e2c72159f85097fe2
+++ NEWS	89d7a8cd576f5a5fba704f8485efbfc95c93ff18
@@ -27,6 +27,7 @@
  - bugfix: the global qt translation is now loaded properly
  - bugfix: double-clicking on mtn databases on Mac OS X no longer leads to
    application hangs
+ - bugfix: the file diff dialog no longer tries to show binary diffs
  - change: the proper monotone version is now solely determined by looking at
    the output of interface version. An upper limit has been introduced for that
    as well; the dialogs now show the interface version of the installed mtn
============================================================
--- src/view/dialogs/FileDiff.cpp	d2f5ff9152be8a3ccc332dcf9ca71a8e56aa5535
+++ src/view/dialogs/FileDiff.cpp	3ca14f49640303a7a64cb0def33be2a4a1a519be
@@ -178,6 +178,18 @@ void FileDiff::applyDiff()
         return;
     }
 
+    if (diff->is_binary)
+    {
+        QMessageBox::information(
+            this,
+            tr("File is binary"),
+            tr("The file is binary and cannot be diffed."),
+            QMessageBox::Ok
+        );
+        reject();
+        return;
+    }
+
     fileModel->applyDiff(diff);
     diffStatusView->update();
 }