One Who Waits for the Sun to Rise and Moves from His Place of Prayer

If a worshipper sits after the Fajr prayer until the sun rises, and then moves from his place of prayer, is the reward of Hajj and 'Umrah recorded for him?
If a person sits in his place of prayer waiting for the sun to rise, and then prays two rak'ahs, but he gets up from his place to another place to listen to dhikr, or to refresh himself from sleep, there is nothing wrong with that; because the place of prayer is one.