[mythtv] changes to conflict resolution

[Matt Zimmerman]

On Thu, Jun 05, 2003 at 12:21:22AM -0400, Matt Zimmerman wrote:

> Does this look about like what you had?
> 
> -- 
>  - mdz
> 
> --- scheduler.cpp.~1.24.~	2003-05-23 22:42:31.000000000 -0400
> +++ scheduler.cpp	2003-06-05 00:20:27.000000000 -0400
> @@ -379,21 +379,9 @@
>                      else if (first->IsSameProgram(*second))
>                      {
>                          if (second->conflicting && !first->conflicting)
> -                        {
> -                            delete second;
> -                            deliter = j.base();
> -                            j++;
> -                            deliter--;
> -                            recordingList.erase(deliter);
> -                        }
> +                            second->recording = false;
>                          else
> -                        {
> -                            delete first;
> -                            deliter = i.base();
> -                            deliter--;
> -                            recordingList.erase(deliter);
> -                            break;
> -                        }
> +                            first->recording = false;
>                      }
>                  }
>              }

I've looked at this some more, and the conflict resolution dialog doesn't
handle this case correctly yet.  This will require a few small adjustments.

-- 
 - mdz