From d76bf1ecd81b947a2f871dae2d5f940dfa0eced7 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Sun, 29 Jul 2012 00:47:49 +0000 Subject: [PATCH] fixed: broken start/stop actions enabled in gui --- src/gui/src/MainWindow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index ba05f2e6..77e1b6d5 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -602,9 +602,6 @@ void MainWindow::synergyFinished(int exitCode, QProcess::ExitStatus) #endif setSynergyState(synergyDisconnected); - - // do not call stopSynergy() in case of clean synergy shutdown, because this must have (well, should have...) - // come from our own delete synergyProcess() in stopSynergy(), so we would do a double-delete... } void MainWindow::setSynergyState(qSynergyState state) @@ -625,12 +622,17 @@ void MainWindow::setSynergyState(qSynergyState state) m_pButtonToggleStart->setText(tr("&Start")); } + bool connected = state == synergyConnected; + // only disable controls in desktop mode. in service mode, we can use the apply button. if (appConfig().processMode() == Desktop) { - setFormEnabled(state != synergyConnected); + setFormEnabled(!connected); } + m_pActionStartSynergy->setEnabled(!connected); + m_pActionStopSynergy->setEnabled(connected); + switch (state) { case synergyConnected: { @@ -655,8 +657,6 @@ void MainWindow::setFormEnabled(bool enabled) { m_pGroupClient->setEnabled(enabled); m_pGroupServer->setEnabled(enabled); - m_pActionStartSynergy->setEnabled(enabled); - m_pActionStopSynergy->setEnabled(enabled); } void MainWindow::setVisible(bool visible)