rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#6471 Added Pending retry state

This commit is contained in:
Jamie Newbon 2019-04-30 11:42:34 +01:00
parent 6870af8eb7
commit 6f17cb9a31
No known key found for this signature in database
GPG Key ID: 9618C9BB2FF44DB5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/src/MainWindow.cpp
View File

@ -914,6 +914,7 @@ void MainWindow::synergyFinished(int exitCode, QProcess::ExitStatus)
if (m_ExpectedRunningState == kStarted) { if (m_ExpectedRunningState == kStarted) {
QTimer::singleShot(1000, this, SLOT(startSynergy())); QTimer::singleShot(1000, this, SLOT(startSynergy()));
appendLogInfo(QString("detected process not running, auto restarting")); appendLogInfo(QString("detected process not running, auto restarting"));
setSynergyState(synergyPendingRetry);
} }
else { else {
setSynergyState(synergyDisconnected); setSynergyState(synergyDisconnected);
@ -932,7 +933,7 @@ void MainWindow::setSynergyState(qSynergyState state)
if (synergyState() == state) if (synergyState() == state)
return; return;
if ((state == synergyConnected) || (state == synergyListening)) if ((state == synergyConnected) || (state == synergyConnecting) || (state == synergyListening) || (state == synergyPendingRetry))
{ {
disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger())); disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger()));
connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger())); connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger()));

3
src/gui/src/MainWindow.h
View File

@ -73,7 +73,8 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
synergyDisconnected, synergyDisconnected,
synergyConnecting, synergyConnecting,
synergyConnected, synergyConnected,
synergyListening synergyListening,
synergyPendingRetry
}; };
enum qSynergyType enum qSynergyType