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

[fix] Fixed Windows MainWindow instance

Browse Source 
Former-commit-id: 3b8852208c
This commit is contained in:
Leroy.H.Y 2019-12-02 16:28:42 +08:00
parent f1f832cd01
commit 6642c332cb
6 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build.Counter
View File

@ -1 +1 @@
1282
1285

2
src/components/QvSystemProxyConfigurator.cpp
View File

@ -56,7 +56,7 @@ namespace Qv2ray
LOG(MODULE_PROXY, "InternetQueryOption failed,GLE=" + to_string(GetLastError()));
if (Option[4].Value.pszValue != nullptr)
LOG(MODULE_PROXY, Option[4].Value.pszValue);
LOG(MODULE_PROXY, QString::fromStdWString(Option[4].Value.pszValue).toStdString());
INTERNET_VERSION_INFO Version;
nSize = sizeof(INTERNET_VERSION_INFO);

19
src/ui/NetSpeedBar/QvNetSpeedBar.cpp
View File

@ -34,18 +34,25 @@ namespace Qv2ray
}
QString GetAnswerToRequest(const QString &pchRequest)
{
auto vinstance = mwInstance->vinstance;
auto instance = MainWindow::mwInstance;
if (instance == nullptr || instance->vinstance == nullptr) {
LOG(MODULE_PLUGIN, "MainWindow != nullptr Assertion failed!")
return "{}";
}
auto vinstance = instance->vinstance;
//
auto req = pchRequest.trimmed();
config = GetGlobalConfig();
QString reply = "{}";
if (req == "START") {
emit mwInstance->Connect();
emit instance->Connect();
} else if (req == "STOP") {
emit mwInstance->DisConnect();
emit instance->DisConnect();
} else if (req == "RESTART") {
emit mwInstance->ReConnect();
emit instance->ReConnect();
}
auto BarConfig = config.toolBarConfig;
@ -82,13 +89,13 @@ namespace Qv2ray
case 104: {
// Current Connection Name
CL.Message = mwInstance->CurrentConnectionName.toStdString();
CL.Message = instance->CurrentConnectionName.toStdString();
break;
}
case 105: {
// Current Connection Status
switch (mwInstance->vinstance->ConnectionStatus) {
switch (instance->vinstance->ConnectionStatus) {
case STARTED: {
CL.Message = QObject::tr("Connected").toStdString();
break;

26
src/ui/NetSpeedBar/QvNetSpeedBar_win.cpp
View File

@ -88,18 +88,22 @@ namespace Qv2ray
}
auto req = QString::fromStdWString(pchRequest);
auto replyQString = isExiting ? "{}" : GetAnswerToRequest(req);
//
// REPLY as std::string
std::string pchReply = replyQString.toUtf8().constData();
cbReplyBytes = static_cast<DWORD>(pchReply.length() + 1) * sizeof(CHAR);
//cbReplyBytes = static_cast<DWORD>(replyQString.length() + 1) * sizeof(TCHAR);
//
fSuccess = WriteFile(hPipe, pchReply.c_str(), cbReplyBytes, &cbWritten, nullptr);
QString replyQString = "{}";
if (!fSuccess || cbReplyBytes != cbWritten) {
LOG(MODULE_PLUGIN, "InstanceThread WriteFile failed, GLE=" + to_string(GetLastError()))
break;
if (!isExiting) {
replyQString = GetAnswerToRequest(req);
//
// REPLY as std::string
std::string pchReply = replyQString.toUtf8().constData();
cbReplyBytes = static_cast<DWORD>(pchReply.length() + 1) * sizeof(CHAR);
//cbReplyBytes = static_cast<DWORD>(replyQString.length() + 1) * sizeof(TCHAR);
//
fSuccess = WriteFile(hPipe, pchReply.c_str(), cbReplyBytes, &cbWritten, nullptr);
if (!fSuccess || cbReplyBytes != cbWritten) {
LOG(MODULE_PLUGIN, "InstanceThread WriteFile failed, GLE=" + to_string(GetLastError()))
break;
}
}
}

4
src/ui/w_MainWindow.cpp
View File

@ -39,11 +39,13 @@
} \
} \
MainWindow *MainWindow::mwInstance = nullptr;
MainWindow::MainWindow(QWidget *parent):
QMainWindow(parent), vinstance(), uploadList(), downloadList(), HTTPRequestHelper(),
hTray(new QSystemTrayIcon(this)), vCoreLogHighlighter(), qvAppLogHighlighter()
{
mwInstance = this;
MainWindow::mwInstance = this;
auto conf = GetGlobalConfig();
vinstance = new ConnectionInstance();
connect(vinstance, &ConnectionInstance::onProcessOutputReadyRead, this, &MainWindow::UpdateVCoreLog);

3
src/ui/w_MainWindow.hpp
View File

@ -78,6 +78,7 @@ class MainWindow : public QMainWindow, Ui::MainWindow
void on_masterLogBrowser_textChanged();
public:
static MainWindow *mwInstance;
CONFIGROOT CurrentFullConfig;
QString CurrentConnectionName = "";
ConnectionInstance *vinstance;
@ -126,6 +127,4 @@ class MainWindow : public QMainWindow, Ui::MainWindow
int currentLogBrowserId = 0;
};
static const MainWindow *mwInstance;
#endif // MAINWINDOW_H