[mythtv-firehose] mythtv branch master updated by paulh. v0.28-pre-2991-g6386911

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user paulh.
       via  638691117f641b54639f2cd3b632e6e7a39b9b0f (commit)
      from  dba6f3bfa8385c9923f526946ebb792199f863a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 638691117f641b54639f2cd3b632e6e7a39b9b0f
Author:    Paul Harrison <pharrison at mythtv.org> at Sun, 9 Aug 2015 10:29:55 +0100
Committer: Paul Harrison <pharrison at mythtv.org> at Sun, 9 Aug 2015 10:29:55 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=638691117f641b54639f2cd3b632e6e7a39b9b0f

MythZoneMinder: fix the wrong monitor sometimes showing for alarm notifications
The existing code assumed monitors were numbered consecutively which may not
be the case if monitors have been deleted in ZM.

Also improve the logging for alarm state changes.



-----------------------------------------------------------------------

Summary of changes:
 .../mythzoneminder/alarmnotifythread.cpp           |   15 +++++---
 .../mythzoneminder/mythzoneminder/zmclient.cpp     |   34 +++++++++++++++++++-
 .../mythzoneminder/mythzoneminder/zmminiplayer.cpp |    2 +-
 3 files changed, 43 insertions(+), 8 deletions(-)

--