github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-21 11:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed the 'download success' messagebox even the GFWList operation is cancelled

Browse Source
This commit is contained in:
Qv2ray-dev 2020-02-10 22:43:51 +08:00
parent ba420156b4
commit 040358735a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui/w_PreferencesWindow.cpp
View File

@ -404,12 +404,11 @@ void PreferencesWindow::on_cancelIgnoreVersionBtn_clicked()
void PreferencesWindow::on_tProxyCheckBox_stateChanged(int arg1)
{
LOADINGCHECK
#ifdef __linux
LOADINGCHECK
#ifdef Q_OS_LINUX
// Set UID and GID for linux
// Setting up tProxy for linux
// Steps:
// --> 1. Copy V2ray core files to the #CONFIG_DIR#/vcore/ dir.
// --> 1. Copy V2ray core files to the QV2RAY_TPROXY_VCORE_PATH and QV2RAY_TPROXY_VCTL_PATH dir.
// --> 2. Change GlobalConfig.v2CorePath.
// --> 3. Call `pkexec setcap CAP_NET_ADMIN,CAP_NET_RAW,CAP_NET_BIND_SERVICE=eip` on the V2ray core.
if (arg1 == Qt::Checked) {
@ -874,6 +873,12 @@ void PreferencesWindow::on_pacGoBtn_clicked()
case 6:
auto file = QFileDialog::getOpenFileName(this, tr("Select GFWList in base64"));
if (file.isEmpty()) {
QvMessageBoxWarn(this, tr("Download GFWList"), tr("Operation is cancelled."));
return;
}
fileContent = StringFromFile(file);
break;
}