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

fix: GUARD!

Browse Source
This commit is contained in:
Qv2ray-dev 2020-03-19 16:51:46 +08:00
parent 489c227e6b
commit f73808aece
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ui/editors/w_RoutesEditor.cpp
View File

@ -18,7 +18,6 @@
using QtNodes::FlowView; using QtNodes::FlowView;
using namespace Qv2ray::ui::nodemodels; using namespace Qv2ray::ui::nodemodels;
static bool isLoading = false;
#define CurrentRule this->rules[this->currentRuleTag] #define CurrentRule this->rules[this->currentRuleTag]
#define LOADINGCHECK \ #define LOADINGCHECK \
if (isLoading) \ if (isLoading) \
@ -914,8 +913,8 @@ void RouteEditor::on_editBtn_clicked()
if (isTagChanged) if (isTagChanged)
{ {
DEBUG(MODULE_UI, "Outbound tag is changed: " + QString(isTagChanged))
auto newTag = getTag(_result); auto newTag = getTag(_result);
DEBUG(MODULE_UI, "Outbound tag is changed: " + newTag)
RenameItemTag(RENAME_OUTBOUND, getTag(_out), &newTag); RenameItemTag(RENAME_OUTBOUND, getTag(_out), &newTag);
} }

1
src/ui/editors/w_RoutesEditor.hpp
View File

@ -103,6 +103,7 @@ class RouteEditor
void onConnectionDeleted(QtNodes::Connection const &c); void onConnectionDeleted(QtNodes::Connection const &c);
private: private:
bool isLoading = false;
void RenameItemTag(ROUTE_EDIT_MODE mode, const QString originalTag, QString *newTag); void RenameItemTag(ROUTE_EDIT_MODE mode, const QString originalTag, QString *newTag);
void ShowCurrentRuleDetail(); void ShowCurrentRuleDetail();
// //

7
src/ui/editors/w_RoutesEditor_extra.cpp
View File

@ -267,9 +267,12 @@ void RouteEditor::ResolveDefaultOutboundTag(QString original, QString newTag)
{ {
LOG(MODULE_UI, "Resolving default outbound settings: default=" + defaultOutbound + " original=" + original + " new=" + newTag) LOG(MODULE_UI, "Resolving default outbound settings: default=" + defaultOutbound + " original=" + original + " new=" + newTag)
auto isDefaultChanged = original == defaultOutbound; auto isDefaultChanged = original == defaultOutbound;
//
isLoading = true;
defaultOutboundCombo->clear(); defaultOutboundCombo->clear();
defaultOutboundCombo->addItems(outbounds.keys()); defaultOutboundCombo->addItems(outbounds.keys());
isLoading = false;
//
if (!isDefaultChanged) if (!isDefaultChanged)
{ {
LOG(MODULE_UI, "Default outbound is not changed: retaining: " + defaultOutbound) LOG(MODULE_UI, "Default outbound is not changed: retaining: " + defaultOutbound)
@ -293,7 +296,7 @@ void RouteEditor::ResolveDefaultOutboundTag(QString original, QString newTag)
} }
else else
{ {
LOG(MODULE_UI, "Default outbound is renamed, ") LOG(MODULE_UI, "Default outbound is renamed, new tag is " + newTag)
defaultOutboundCombo->setCurrentText(newTag); defaultOutboundCombo->setCurrentText(newTag);
defaultOutbound = newTag; defaultOutbound = newTag;
} }

3
src/ui/w_MainWindow.cpp
View File

@ -850,9 +850,8 @@ void MainWindow::OnConnectionCreated(const ConnectionId &id, const QString &disp
} }
void MainWindow::OnConnectionDeleted(const ConnectionId &id, const GroupId &groupId) void MainWindow::OnConnectionDeleted(const ConnectionId &id, const GroupId &groupId)
{ {
auto &child = connectionNodes.value(id); auto child = connectionNodes.take(id);
groupNodes.value(groupId)->removeChild(child.get()); groupNodes.value(groupId)->removeChild(child.get());
connectionNodes.remove(id);
} }
void MainWindow::OnConnectionGroupChanged(const ConnectionId &id, const GroupId &originalGroup, const GroupId &newGroup) void MainWindow::OnConnectionGroupChanged(const ConnectionId &id, const GroupId &originalGroup, const GroupId &newGroup)
{ {