Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qt: Fix building on <= 5.7.x #6000

Merged
merged 1 commit into from
Sep 2, 2017
Merged

Qt: Fix building on <= 5.7.x #6000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions Source/Core/DolphinQt2/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,13 +864,14 @@ void MainWindow::OnImportNANDBackup()
dialog->setLabelText(tr("Importing NAND backup"));
dialog->setCancelButton(nullptr);

auto beginning = QDateTime::currentDateTime().toSecsSinceEpoch();
auto beginning = QDateTime::currentDateTime().toMSecsSinceEpoch();

auto result = std::async(std::launch::async, [&] {
DiscIO::NANDImporter().ImportNANDBin(file.toStdString(), [&dialog, beginning] {
QueueOnObject(dialog, [&dialog, beginning] {
dialog->setLabelText(tr("Importing NAND backup\n Time elapsed: %1s")
.arg(QDateTime::currentDateTime().toSecsSinceEpoch() - beginning));
dialog->setLabelText(
tr("Importing NAND backup\n Time elapsed: %1s")
.arg((QDateTime::currentDateTime().toMSecsSinceEpoch() - beginning) / 1000));
});
});
QueueOnObject(dialog, [dialog] { dialog->close(); });
Expand Down