Merge lp:~phablet-team/media-hub/fix-1579953 into lp:media-hub

[Jim Hodapp]

Make sure that is_current_player() doesn't crash when there isn't a current player pointer set.

Make sure that is_current_player() doesn't crash when there isn't a current player pointer set.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:183
http://jenkins.qa.ubuntu.com/job/media-hub-ci/408/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/248
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/248/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/248

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/408/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

=== modified file 'src/core/media/service_skeleton.cpp'
--- src/core/media/service_skeleton.cpp	2016-05-03 18:06:41 +0000
+++ src/core/media/service_skeleton.cpp	2016-05-17 17:52:46 +0000
@@ -812,6 +812,11 @@
         bool is_current_player(media::Player::PlayerKey key)
 
         {
+            if (not service_skel_config.player_store)
+                return false;
+            if (not service_skel_config.player_store->current_player().get())
+                return false;
+
             return key == service_skel_config.player_store->current_player().get()->key();
         }