wip
This commit is contained in:
parent
1f08d78b43
commit
3aa8a46f6e
2 changed files with 8 additions and 8 deletions
|
|
@ -34,13 +34,13 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
|
||||||
|
|
||||||
void ConnectionController::openConnection()
|
void ConnectionController::openConnection()
|
||||||
{
|
{
|
||||||
// #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
|
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
|
||||||
// if (!Utils::processIsRunning(Utils::executable(SERVICE_NAME, false), true))
|
if (!Utils::processIsRunning(Utils::executable(SERVICE_NAME, false), true))
|
||||||
// {
|
{
|
||||||
// emit connectionErrorOccurred(ErrorCode::AmneziaServiceNotRunning);
|
emit connectionErrorOccurred(ErrorCode::AmneziaServiceNotRunning);
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
// #endif
|
#endif
|
||||||
|
|
||||||
int serverIndex = m_serversModel->getDefaultServerIndex();
|
int serverIndex = m_serversModel->getDefaultServerIndex();
|
||||||
QJsonObject serverConfig = m_serversModel->getServerConfig(serverIndex);
|
QJsonObject serverConfig = m_serversModel->getServerConfig(serverIndex);
|
||||||
|
|
|
||||||
|
|
@ -247,7 +247,7 @@ bool Utils::killProcessByName(const QString &name)
|
||||||
CloseHandle(hSnapshot);
|
CloseHandle(hSnapshot);
|
||||||
return success;
|
return success;
|
||||||
#elif defined Q_OS_IOS || defined(Q_OS_ANDROID)
|
#elif defined Q_OS_IOS || defined(Q_OS_ANDROID)
|
||||||
return;
|
return false;
|
||||||
#else
|
#else
|
||||||
QProcess::execute(QString("pkill %1").arg(name));
|
QProcess::execute(QString("pkill %1").arg(name));
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue