1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr983'

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2015-01-05 17:50:17 +01:00
commit 2cf08dca4d
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -32,5 +32,11 @@ LoadHistoryDialog::~LoadHistoryDialog()
QDateTime LoadHistoryDialog::getFromDate() QDateTime LoadHistoryDialog::getFromDate()
{ {
QDateTime res(ui->fromDate->selectedDate()); QDateTime res(ui->fromDate->selectedDate());
if (res.date().month() != ui->fromDate->monthShown() || res.date().year() != ui->fromDate->yearShown())
{
QDate newDate(ui->fromDate->yearShown(), ui->fromDate->monthShown(), 1);
res.setDate(newDate);
}
return res; return res;
} }