AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash on fatal error, remove moc files from Windows installation

Browse source
This commit is contained in:
driftingsun 2021-01-10 18:47:29 +03:00
parent dd46d8cf99
commit 3369a387ce
4 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/protocols/openvpnprotocol.cpp
View file

@ -226,6 +226,7 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
else { else {
emit protocolError(ErrorCode::OpenVpnUnknownError); emit protocolError(ErrorCode::OpenVpnUnknownError);
} }
return;
} }
QByteArray data(line.toStdString().c_str()); QByteArray data(line.toStdString().c_str());

5
client/ui/mainwindow.cpp
View file

@ -37,6 +37,7 @@ MainWindow::MainWindow(QWidget *parent) :
m_settings(new Settings) m_settings(new Settings)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->label_error_text->clear();
ui->widget_tittlebar->installEventFilter(this); ui->widget_tittlebar->installEventFilter(this);
ui->stackedWidget_main->setSpeed(200); ui->stackedWidget_main->setSpeed(200);
@ -376,8 +377,7 @@ void MainWindow::onConnectionStateChanged(VpnProtocol::ConnectionState state)
void MainWindow::onVpnProtocolError(ErrorCode errorCode) void MainWindow::onVpnProtocolError(ErrorCode errorCode)
{ {
// TODO fix crash on Windows when starting vpn and another vpn already connected ui->label_error_text->setText(errorString(errorCode));
//QMessageBox::critical(this, APPLICATION_NAME, errorString(errorCode));
} }
void MainWindow::onPushButtonConnectClicked(bool checked) void MainWindow::onPushButtonConnectClicked(bool checked)
@ -529,6 +529,7 @@ void MainWindow::onTrayActivated(QSystemTrayIcon::ActivationReason reason)
void MainWindow::onConnect() void MainWindow::onConnect()
{ {
ui->label_error_text->clear();
ui->pushButton_connect->setChecked(true); ui->pushButton_connect->setChecked(true);
qApp->processEvents(); qApp->processEvents();

24
client/ui/mainwindow.ui
View file

@ -267,7 +267,7 @@ QStackedWidget QWidget {
</string> </string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="page_start"> <widget class="QWidget" name="page_start">
<widget class="QLabel" name="label_23"> <widget class="QLabel" name="label_23">
@ -1140,6 +1140,28 @@ color: #181922;
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_error_text">
<property name="geometry">
<rect>
<x>0</x>
<y>300</y>
<width>381</width>
<height>51</height>
</rect>
</property>
<property name="text">
<string>Error text</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</widget> </widget>
<widget class="QWidget" name="page_sites"> <widget class="QWidget" name="page_sites">
<property name="styleSheet"> <property name="styleSheet">

1
deploy/windows.bat
View file

@ -45,6 +45,7 @@ del "%OUT_APP_DIR:"=%\*.cpp"
del "%OUT_APP_DIR:"=%\*.h" del "%OUT_APP_DIR:"=%\*.h"
del "%OUT_APP_DIR:"=%\*.res" del "%OUT_APP_DIR:"=%\*.res"
del "%OUT_APP_DIR:"=%\*.o" del "%OUT_APP_DIR:"=%\*.o"
del "%OUT_APP_DIR:"=%\*.moc"
del "%OUT_APP_DIR:"=%\*.lib" del "%OUT_APP_DIR:"=%\*.lib"
del "%OUT_APP_DIR:"=%\*.exp" del "%OUT_APP_DIR:"=%\*.exp"
echo "Deploying..." echo "Deploying..."