merge conflicts

zenustech · Oct 12, 2023 · 3f41bb4 · 3f41bb4
1 parent a491be7
commit 3f41bb4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/ui/zenoedit/dock/docktabcontent.cpp b/ui/zenoedit/dock/docktabcontent.cpp
@@ -450,10 +450,6 @@ void DockContent_Editor::initConnections()
     };
     connect(zenoApp->graphsManagment(), &GraphsManagment::fileOpened, this, resetAlways);
     connect(zenoApp->graphsManagment(), &GraphsManagment::modelInited, this, resetAlways);
-    connect(m_btnRun, &ZToolMenuButton::runModeChanged, this, [=]() {
-        if (pAlways->isChecked())
-            emit pAlways->toggled(true);
-    });
     connect(pAlways, &ZToolBarButton::toggled, this, [=](bool bChecked) {
         if (bChecked)
         {
@@ -551,6 +547,8 @@ void DockContent_Editor::initConnections()
     });
 
     connect(m_btnRun, &ZToolMenuButton::textChanged, this, [=]() {
+        if (pAlways->isChecked())
+            emit pAlways->toggled(true);
         QString text = m_btnRun->text();
         QColor clr;
         if (text == tr("Run"))