Next prayer skips current prayer

[hammady]

Next prayer is defined as the next available iqama. Currently it shows the following prayer once the first iqama has passed.
For example isha iqamas are from 7:15 to 7:45. It shows next as Isha until 7:15 then switches to Fajr. It should keep showing Isha as the next prayer until 7:45.
See screenshots for an example.