diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 10:45:31 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 10:45:31 +0100 |
| commit | 0f151e37cba454fcb863b6b38e1780f2b04be903 (patch) | |
| tree | 5b0f84879eb2896158c4f3c4f82c0391c8ec3380 /riscos/gui.c | |
| parent | f5c62c2291add5e6e3b8fc604831283e4883a3c6 (diff) | |
| parent | 18aefabd20a16dda9ed5363088f0da5ada0d4431 (diff) | |
| download | netsurf-0f151e37cba454fcb863b6b38e1780f2b04be903.tar.gz netsurf-0f151e37cba454fcb863b6b38e1780f2b04be903.tar.bz2 | |
Merge branch 'vince/reformatpending'
Conflicts:
amiga/gui.c
Diffstat (limited to 'riscos/gui.c')
| -rw-r--r-- | riscos/gui.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/riscos/gui.c b/riscos/gui.c index 00f6ebc11..3253f796f 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -1864,17 +1864,18 @@ static void riscos_poll(bool active) /* Poll wimp. */ xhourglass_off(); track_poll_offset = ro_mouse_poll_interval(); - if (sched_active || (track_poll_offset > 0) || - browser_reformat_pending) { + if (sched_active || (track_poll_offset > 0)) { os_t t = os_read_monotonic_time(); - if (track_poll_offset > 0) + if (track_poll_offset > 0) { t += track_poll_offset; - else + } else { t += 10; + } - if (sched_active && (sched_time - t) < 0) + if (sched_active && (sched_time - t) < 0) { t = sched_time; + } event = wimp_poll_idle(mask, &block, t, 0); } else { @@ -1895,9 +1896,6 @@ static void riscos_poll(bool active) } ro_gui_window_update_boxes(); - - if (browser_reformat_pending && event == wimp_NULL_REASON_CODE) - ro_gui_window_process_reformats(); } |