Skip to content
This repository has been archived by the owner on Apr 15, 2023. It is now read-only.

FIX: conflict detection for Timers, Threads on OS X #272

Merged
merged 1 commit into from
Apr 25, 2014

Conversation

Red-F
Copy link
Contributor

@Red-F Red-F commented Feb 15, 2014

  • use EPG data to retrieve original title before creating a new ARGUS TV schedule, this improves timer conflict detection (much!)
  • renamed some left-over from ForTheRecord to ARGUS

@Red-F
Copy link
Contributor Author

Red-F commented Apr 15, 2014

ping @opdenkamp.

Hi Lars anything specific in this PR that prevents it from being merged these last two months?

@opdenkamp
Copy link
Owner

i wanted to do another sync of the add-ons before the gotham release last week, but completely forgot about it.

this looks like a fix. if it is, stick "fix" in the title please, rebase the PR so it can be merged, and I'll have a look at doing another sync this week (might have to remind me again :P)

… timer

conflict detection (much!)
[argustv] Fix: threads now working as intented on OSX
@Red-F Red-F changed the title Improved conflic detection for Timers FIX: conflict detection for Timers, Threads on OS X Apr 22, 2014
@Red-F
Copy link
Contributor Author

Red-F commented Apr 22, 2014

Ok, Lars. I have changed the title, rebased the PR and built and run it on Windows, Linux and OS X (Mountain Lion).

opdenkamp pushed a commit that referenced this pull request Apr 25, 2014
FIX: conflict detection for Timers, Threads on OS X
@opdenkamp opdenkamp merged commit 2370645 into opdenkamp:master Apr 25, 2014
@Red-F Red-F deleted the resolve-timers branch April 4, 2015 10:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants