From 20cb624c3be74697f5b88dedf20dda1d425384a0 Mon Sep 17 00:00:00 2001 From: Xinyu Hou Date: Wed, 29 Jul 2015 15:15:19 -0700 Subject: [PATCH] Used timer instead of delay #4901 --- src/gui/src/MainWindow.cpp | 12 +----------- src/gui/src/MainWindow.h | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 0f576a56..53cf5de9 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -782,9 +782,8 @@ void MainWindow::synergyFinished(int exitCode, QProcess::ExitStatus) } if (m_ExpectedRunningState == kStarted) { - delay(1); + QTimer::singleShot(1000, this, SLOT(startSynergy())); appendLogInfo(QString("detected process not running, auto restarting")); - startSynergy(); } else { setSynergyState(synergyDisconnected); @@ -1336,12 +1335,3 @@ QString MainWindow::getProfileRootForArg() return QString("\"%1\"").arg(dir); } - -void MainWindow::delay(unsigned int s) -{ - QTime dieTime= QTime::currentTime().addSecs(s); - - while (QTime::currentTime() < dieTime) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 100); - } -} diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 89d8c380..5f0035ac 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -114,7 +114,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase void serverDetected(const QString name); void setEdition(int type); void updateLocalFingerprint(); - void delay(unsigned int); public slots: void appendLogRaw(const QString& text);