[...]
if(aspopup) {
[...] 
} else {
   [...]
   RefreshDay(prevday);
   if(istoday)
      SetDate(dt); //this line was changed
   else if()
      [...]
}