[vdr] Re: Problems with subtitles (problem solved)

[Lollero <lollero@rrsite.com>]

On Fri, 24 Sep 2004, Timo Laitinen wrote:

> On Fri, 24 Sep 2004 20:31:50 +0300 (EEST)
> Lollero <lollero@rrsite.com> wrote:
> 
> > On Fri, 24 Sep 2004, Timo Laitinen wrote:
> > 
> > > On Thu, 16 Sep 2004 18:52:10 +0300
> > > Timo Laitinen <timolai@utu.fi> wrote:
> > > 
> > > 
> > > > problem? I've applied the DVBsubs.patch (which had a couple of
> > > > resolvable conflicts, hopefully correctly...).
> > > 
> > > Hrm... Problem solved: I didn't resolve the conflicts correctly...
> > > works now.
> > > 
> > > Best Regards,
> > > 
> > > Timo
> > 
> > I have the same probem.
> > Can you provide working patch, or describe how those conflicts should
> > be resolved?
> > 
> 
> In file osd.c, the location of the new bit is crucial. I put it after
> the new "if (cOsd::IsOpen())" block first... so it returned NULL.
> The function in question, cOsdProvider::NewOsd,  should look like this:
> ...

Thanks. It works great now.
I made same mistake putting the conflicted part after "if (cOsd:Is.."