[mythtv-commits] [MythTV/mythtv] 782142: Function value of ShowManualChannelPopup

[kmdewaal]

  Branch: refs/heads/master
  Home:   https://github.com/MythTV/mythtv
  Commit: 7821422d7438908650e47002887b5dc71f2951c5
      https://github.com/MythTV/mythtv/commit/7821422d7438908650e47002887b5dc71f2951c5
  Author: Klaas de Waal <kdewaal at mythtv.org>
  Date:   2019-07-21 (Sun, 21 Jul 2019)

  Changed paths:
    M mythtv/libs/libmythtv/channelscan/channelimporter.cpp

  Log Message:
  -----------
  Function value of ShowManualChannelPopup

The ShowManualChannelPopup dialog of mythtv-setup
has the choices OK, Edit, Cancel and Cancel All.
This dialog is used when there is a conflict in updating
channels after a channel scan.
With this fix the dialog returns kOctCancel for the Cancel
button and kOctCancelAll for the Cancel All button.
Previously, kOctCancelAll was returned for both the Cancel
and the Cancel All button.