Merge branch 'master' of git://github.com/ckolivas/cgminer.git
diff --git a/cgminer.c b/cgminer.c
index 8b7de73..343209c 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -3648,7 +3648,8 @@ static inline bool should_roll(struct work *work)
* reject blocks as invalid. */
static inline bool can_roll(struct work *work)
{
- return (work->pool && work->rolltime && !work->clone && work->rolls < 7000);
+ return (work->pool && work->rolltime && !work->clone &&
+ work->rolls < 7000 && !stale_work(work, false));
}
static void roll_work(struct work *work)