Media items cause issues throughout OpenLP

This is all happening in trunk...

When sending a media item to either of the controllers, a traceback is shown:

Traceback (most recent call last):
  File "/home/sim/dev/openlp/trunk/openlp/core/lib/mediamanageritem.py", line 493, in on_preview_click
    self.preview_controller.add_service_item(service_item)
  File "/home/sim/dev/openlp/trunk/openlp/core/ui/slidecontroller.py", line 807, in add_service_item
    self._process_item(item, slide_no)
  File "/home/sim/dev/openlp/trunk/openlp/core/ui/slidecontroller.py", line 920, in _process_item
    self.preview_widget.replace_service_item(self.service_item, width, slide_no)
  File "/home/sim/dev/openlp/trunk/openlp/core/widgets/views.py", line 197, in replace_service_item
    pixmap = QtGui.QPixmap(frame['image'])
TypeError: QPixmap(): argument 1 has unexpected type 'QIcon'

I applied a one-line fix by adding the HasThumbnails capability to the media items, but that only produced another error. My fix might be wrong, or more changes need to be made...