Merge master.

[dcpomatic.git] / src / lib / exceptions.cc

diff --git a/src/lib/exceptions.cc b/src/lib/exceptions.cc
index e05ac4ff04b3fdebb5617129f5c9a0eb6c9dc10e..f34cebbfe04a69f94fa2e07df3bb74aab5d41a51 100644 (file)
--- a/src/lib/exceptions.cc
+++ b/src/lib/exceptions.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ PixelFormatError::PixelFormatError (string o, AVPixelFormat f)
 }
 
 SubRipError::SubRipError (string saw, string expecting, boost::filesystem::path f)
-       : FileError (String::compose (_("Error in SubRip file: saw %1 while expecting %2"), saw, expecting), f)
+       : FileError (String::compose (_("Error in SubRip file: saw %1 while expecting %2"), saw.empty() ? "[nothing]" : saw, expecting), f)
 {
-
+       
 }