fixed: broken start/stop actions enabled in gui

This commit is contained in:
Nick Bolton 2012-07-29 00:47:49 +00:00
parent 4d4eecdb5a
commit d76bf1ecd8
1 changed files with 6 additions and 6 deletions

View File

@ -602,9 +602,6 @@ void MainWindow::synergyFinished(int exitCode, QProcess::ExitStatus)
#endif #endif
setSynergyState(synergyDisconnected); 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) void MainWindow::setSynergyState(qSynergyState state)
@ -625,12 +622,17 @@ void MainWindow::setSynergyState(qSynergyState state)
m_pButtonToggleStart->setText(tr("&Start")); m_pButtonToggleStart->setText(tr("&Start"));
} }
bool connected = state == synergyConnected;
// only disable controls in desktop mode. in service mode, we can use the apply button. // only disable controls in desktop mode. in service mode, we can use the apply button.
if (appConfig().processMode() == Desktop) if (appConfig().processMode() == Desktop)
{ {
setFormEnabled(state != synergyConnected); setFormEnabled(!connected);
} }
m_pActionStartSynergy->setEnabled(!connected);
m_pActionStopSynergy->setEnabled(connected);
switch (state) switch (state)
{ {
case synergyConnected: { case synergyConnected: {
@ -655,8 +657,6 @@ void MainWindow::setFormEnabled(bool enabled)
{ {
m_pGroupClient->setEnabled(enabled); m_pGroupClient->setEnabled(enabled);
m_pGroupServer->setEnabled(enabled); m_pGroupServer->setEnabled(enabled);
m_pActionStartSynergy->setEnabled(enabled);
m_pActionStopSynergy->setEnabled(enabled);
} }
void MainWindow::setVisible(bool visible) void MainWindow::setVisible(bool visible)