Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix error

Browse Source
This commit is contained in:
arm64v8a
2022-12-17 14:48:13 +09:00
parent a61417006a
commit deb86aa273
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fmt/Bean2CoreObj_ray.cpp
View File

@@ -51,8 +51,10 @@ namespace NekoRay::fmt {
if (allow_insecure || dataStore->skip_cert) tls["allowInsecure"] = true; if (allow_insecure || dataStore->skip_cert) tls["allowInsecure"] = true;
if (!sni.trimmed().isEmpty()) tls["serverName"] = sni; if (!sni.trimmed().isEmpty()) tls["serverName"] = sni;
if (!certificate.trimmed().isEmpty()) { if (!certificate.trimmed().isEmpty()) {
tls["disableSystemRoot"] = true;
tls["certificates"] = QJsonArray{ tls["certificates"] = QJsonArray{
QJsonObject{ QJsonObject{
{"usage", "verify"},
{"certificate", QList2QJsonArray(SplitLines(certificate.trimmed()))}, {"certificate", QList2QJsonArray(SplitLines(certificate.trimmed()))},
}, },
}; };

9
ui/mainwindow.cpp
View File

@@ -683,7 +683,7 @@ void MainWindow::refresh_status(const QString &traffic_update) {
} }
setWindowTitle(make_title(false)); setWindowTitle(make_title(false));
if (icon_status_new != icon_status) setWindowIcon(TrayIcon::GetIcon(TrayIcon::NONE)); if (icon_status_new != icon_status) QApplication::setWindowIcon(TrayIcon::GetIcon(TrayIcon::NONE));
if (tray != nullptr) { if (tray != nullptr) {
tray->setToolTip(make_title(true)); tray->setToolTip(make_title(true));
@@ -1055,8 +1055,8 @@ void MainWindow::display_qr_link(bool nkrFormat) {
auto link_display = is_nk ? link_nk : link; auto link_display = is_nk ? link_nk : link;
l2->setPlainText(link_display); l2->setPlainText(link_display);
// //
qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(link_display.toUtf8().data(), try {
qrcodegen::QrCode::Ecc::MEDIUM); qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(link_display.toUtf8().data(), qrcodegen::QrCode::Ecc::MEDIUM);
qint32 sz = qr.getSize(); qint32 sz = qr.getSize();
im = QImage(sz, sz, QImage::Format_RGB32); im = QImage(sz, sz, QImage::Format_RGB32);
QRgb black = qRgb(0, 0, 0); QRgb black = qRgb(0, 0, 0);
@@ -1065,6 +1065,9 @@ void MainWindow::display_qr_link(bool nkrFormat) {
for (int x = 0; x < sz; x++) for (int x = 0; x < sz; x++)
im.setPixel(x, y, qr.getModule(x, y) ? black : white); im.setPixel(x, y, qr.getModule(x, y) ? black : white);
show_qr(size()); show_qr(size());
} catch (const std::exception &ex) {
QMessageBox::warning(nullptr, "error", ex.what());
}
} }
W(const QString &link_, const QString &link_nk_) { W(const QString &link_, const QString &link_nk_) {