am 9ba7a526: Merge "slideshow: Dont crash when -t is used"

* commit '9ba7a526f61906845c8e9f79b1495f0162fe62a6':
  slideshow: Dont crash when -t is used