Fix warnings

Add temp var for last recording save path
2026-08-29 12:45:28 -05:00 · 2025-12-11 18:43:49 +01:00 · 2025-12-11 17:22:37 +01:00
48 changed files with 309 additions and 811 deletions
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -6,18 +6,18 @@ You have the option to ...

 Both methods require [CMake](https://cmake.org/download/).

-The plugin can be compiled for OBS 31 and above, although using the latest version of OBS is recommended to support all features.
+The plugin can be compiled for OBS 27 and above, although using the latest version of OBS is recommended to support all features.

 ## Compiling in tree (recommended for development)
 This section assumes that you have a working [OBS Studio development environment](https://obsproject.com/wiki/Building-OBS-Studio).  

-Add the "SceneSwitcher" source directory to your obs-studio source directory under obs-studio/plugins:
+Add the "SceneSwitcher" source directory to your obs-studio source directory under obs-studio/UI/frontend-plugins/:
 ```
-cd obs-studio/plugins
+cd obs-studio/UI/frontend-plugins/
 git clone --recursive https://github.com/WarmUpTill/SceneSwitcher.git
 ```

-Then modify the obs-studio/plugins/CMakeLists.txt and add an entry for the scene switcher:
+Then modify the obs-studio/UI/frontend-plugins/CMakeLists.txt Example and add an entry for the scene switcher:
 ```
 add_subdirectory(SceneSwitcher)
 ```
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,8 +184,6 @@ target_sources(
          lib/utils/canvas-helpers.hpp
          lib/utils/condition-logic.cpp
          lib/utils/condition-logic.hpp
-          lib/utils/crash-handler.cpp
-          lib/utils/crash-handler.hpp
          lib/utils/curl-helper.cpp
          lib/utils/curl-helper.hpp
          lib/utils/cursor-shape-changer.cpp
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -44,8 +44,6 @@ AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage="<html>
 AdvSceneSwitcher.generalTab.generalBehavior.warnCorruptedInstallMessage="The plugin installation seems to be corrupted and might crash!\nPlease make sure the plugin was installed correctly!"
 AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs="Hide tabs which can be represented via macros"
 AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch="Always show macro search"
-AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs="Always show all feature tabs"
-AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs.tooltip="Show tabs that are normally hidden until first used in a macro (e.g. Action Queues, Variables, Twitch, Websockets)."
 AdvSceneSwitcher.generalTab.matchBehavior="Match behavior"
 AdvSceneSwitcher.generalTab.priority="Priority"
 AdvSceneSwitcher.generalTab.priority.description="Switching methods priority (Highest priority is at the top)"
@@ -157,11 +155,13 @@ AdvSceneSwitcher.mqttConnectionTab.removeMultipleConnectionsPopup.text="Are you

 # Macro Tab
 AdvSceneSwitcher.macroTab.title="Macro"
+AdvSceneSwitcher.macroTab.macros="Macros"
 AdvSceneSwitcher.macroTab.priorityWarning="Note: It is recommended to configure macros to be the highest priority functionality.\nThis setting can be changed on the General tab."
 AdvSceneSwitcher.macroTab.help="Macros allow you to execute a string of actions depending on multiple conditions.\n\nClick on the highlighted plus symbol to add a new Macro."
 AdvSceneSwitcher.macroTab.editConditionHelp="This section allows you to define macro conditions.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new condition."
 AdvSceneSwitcher.macroTab.editActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action."
 AdvSceneSwitcher.macroTab.editElseActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are *not* met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action."
+AdvSceneSwitcher.macroTab.edit="Edit macro"
 AdvSceneSwitcher.macroTab.edit.logic="Logic type:"
 AdvSceneSwitcher.macroTab.edit.condition="Condition type:"
 AdvSceneSwitcher.macroTab.edit.action="Action type:"
@@ -1212,8 +1212,8 @@ AdvSceneSwitcher.action.variable.currentSegmentValue="Current value:"
 AdvSceneSwitcher.action.variable.layout.other="{{actions}}{{variables}}{{variables2}}{{strValue}}{{numValue}}{{segmentIndex}}{{mathExpression}}{{envVariableName}}{{scenes}}{{tempVars}}{{tempVarsHelp}}{{sceneItemIndex}}{{direction}}{{stringLength}}{{paddingCharSelection}}{{caseType}}{{jsonQuery}}{{jsonQueryHelp}}{{jsonIndex}}"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}of{{variables}}to length{{stringLength}}by adding{{paddingCharSelection}}to the{{direction}}"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}of{{variables}}to length{{stringLength}}by removing characters from the{{direction}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Substring start:{{subStringStart}}Substring size:{{subStringSize}}{{subStringRegex}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Assign value of{{regexMatchIdx}}match using regular expression:{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringIndex="Substring start:{{subStringStart}}Substring size:{{subStringSize}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Assign value of{{regexMatchIdx}}match using regular expression:"
 AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Use custom prompt{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Fill with placeholder{{inputPlaceholder}}"
@@ -1256,14 +1256,12 @@ AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable="Disable chat's emote
 AdvSceneSwitcher.action.twitch.type.chat.sendMessage="Send chat message"
 AdvSceneSwitcher.action.twitch.type.user.getInfo="Get user information"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="Get channel points reward information"
-AdvSceneSwitcher.action.twitch.type.channel.getInfo="Get channel information"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="Toggle reward name / variable selection control"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Cannot select category without selecting a Twitch account first!"
-AdvSceneSwitcher.action.twitch.layout.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.layout.chat="Using account{{account}}{{actions}}on{{channel}}"
-AdvSceneSwitcher.action.twitch.layout.channel.getInfo="Using account{{account}}{{actions}}of{{channel}}"
-AdvSceneSwitcher.action.twitch.layout.user.getInfo="Using account{{account}}{{actions}}for{{userInfoQueryType}}{{userLogin}}{{userId}}"
-AdvSceneSwitcher.action.twitch.layout.reward.getInfo="Using account{{account}}{{actions}}for channel{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
+AdvSceneSwitcher.action.twitch.entry.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
+AdvSceneSwitcher.action.twitch.entry.chat="Using account{{account}}{{actions}}on{{channel}}"
+AdvSceneSwitcher.action.twitch.entry.user.getInfo="Using account{{account}}{{actions}}for{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.entry.reward.getInfo="Using account{{account}}{{actions}}for channel{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
 AdvSceneSwitcher.action.twitch.title.title="Enter title"
 AdvSceneSwitcher.action.twitch.marker.description="Describe marker"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="Add a slight delay before capturing the clip"
@@ -1388,8 +1386,6 @@ AdvSceneSwitcher.hotkey.macro.segment.remove="Remove selected macro segment"
 AdvSceneSwitcher.askBackup="Detected a new version of the Advanced Scene Switcher.\nShould a backup of the old settings be created?"
 AdvSceneSwitcher.askForMacro="Select macro{{macroSelection}}"

-AdvSceneSwitcher.crashDetected="OBS did not shut down cleanly (for example, due to a crash or freeze).\n\nThe Advanced Scene Switcher plugin would normally start automatically.\nWould you like to keep it stopped for now?"
-
 AdvSceneSwitcher.close="Close"
 AdvSceneSwitcher.browse="Browse"

@@ -2149,8 +2145,6 @@ AdvSceneSwitcher.tempVar.window.window="Window title"
 AdvSceneSwitcher.tempVar.window.window.description="The window title of the matching window."
 AdvSceneSwitcher.tempVar.window.windowClass="Window class"
 AdvSceneSwitcher.tempVar.window.windowClass.description="The window class of the matching window."
-AdvSceneSwitcher.tempVar.window.windowText="Window text"
-AdvSceneSwitcher.tempVar.window.windowText.description="Text contained within the window (won't work on all window types)."

 AdvSceneSwitcher.tempVar.timer.seconds="Seconds"
 AdvSceneSwitcher.tempVar.timer.minutes="Minutes"
--- a/data/locale/fr-FR.ini
+++ b/data/locale/fr-FR.ini
@@ -701,8 +701,8 @@ AdvSceneSwitcher.action.variable.invalidSelection="Sélection invalide !"
 AdvSceneSwitcher.action.variable.actionNoVariableSupport="La récupération de valeurs de variables à partir d'actions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.conditionNoVariableSupport="La récupération de valeurs de variables à partir de conditions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.currentSegmentValue="Valeur actuelle :"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Début de la sous-chaîne :{{subStringStart}}Taille de la sous-chaîne :{{subStringSize}}{{subStringRegex}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Attribuer la valeur du match{{regexMatchIdx}}en utilisant une expression régulière:{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringIndex="Début de la sous-chaîne :{{subStringStart}}Taille de la sous-chaîne :{{subStringSize}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Attribuer la valeur du match{{regexMatchIdx}}en utilisant une expression régulière :"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Utiliser un message personnalisé{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Remplir avec un indicateur de position{{inputPlaceholder}}"
 AdvSceneSwitcher.action.projector="Projecteur"
--- a/data/locale/ja-JP.ini
+++ b/data/locale/ja-JP.ini
@@ -1149,8 +1149,8 @@ AdvSceneSwitcher.action.variable.currentSegmentValue="現在値："
 ; AdvSceneSwitcher.action.variable.layout.other="{{actions}}{{variables}}{{variables2}}{{strValue}}{{numValue}}{{segmentIndex}}{{mathExpression}}{{envVariableName}}{{scenes}}{{tempVars}}{{tempVarsHelp}}{{sceneItemIndex}}{{direction}}{{stringLength}}{{paddingCharSelection}}"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}の{{variables}}の長さを{{stringLength}}にするには、{{paddingCharSelection}}を{{direction}}に追加します。"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}の{{variables}}の長さを{{stringLength}}にするには、{{direction}}から文字を削除します。"
-AdvSceneSwitcher.action.variable.layout.substringIndex="部分文字列の開始:{{subStringStart}}部分文字列のサイズ:{{subStringSize}}{{subStringRegex}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="正規表現を使用して{{regexMatchIdx}}一致の値を割り当てます:{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringIndex="部分文字列の開始:{{subStringStart}}部分文字列のサイズ:{{subStringSize}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="正規表現を使用して{{regexMatchIdx}}一致の値を割り当てます:"
 ; AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}カスタム プロンプトを使用する{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}プレースホルダーを入力{{inputPlaceholder}}"
@@ -1193,10 +1193,10 @@ AdvSceneSwitcher.action.twitch.type.user.getInfo="ユーザー情報を取得"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="チャンネルポイントリワード情報を取得"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="リワード名/変数選択コントロールの切り替え"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Twitchアカウントを選択しないとカテゴリを選択できません！"
-; AdvSceneSwitcher.action.twitch.layout.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}"
-AdvSceneSwitcher.action.twitch.layout.chat="{{channel}}でアカウント{{account}}{{actions}}を使用しています"
-AdvSceneSwitcher.action.twitch.layout.user.getInfo="{{userInfoQueryType}}{{userLogin}}{{userId}}でアカウント{{account}}{{actions}}を使用"
-AdvSceneSwitcher.action.twitch.layout.reward.getInfo="チャンネル{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}でアカウント{{account}}{{actions}}を使用"
+; AdvSceneSwitcher.action.twitch.entry.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}"
+AdvSceneSwitcher.action.twitch.entry.chat="{{channel}}でアカウント{{account}}{{actions}}を使用しています"
+AdvSceneSwitcher.action.twitch.entry.user.getInfo="{{userInfoQueryType}}{{userLogin}}{{userId}}でアカウント{{account}}{{actions}}を使用"
+AdvSceneSwitcher.action.twitch.entry.reward.getInfo="チャンネル{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}でアカウント{{account}}{{actions}}を使用"
 AdvSceneSwitcher.action.twitch.title.title="タイトルを入力"
 AdvSceneSwitcher.action.twitch.marker.description="マーカーの説明"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="クリップをキャプチャする前にわずかな遅延を追加します"
--- a/data/locale/pt-BR.ini
+++ b/data/locale/pt-BR.ini
@@ -1030,8 +1030,8 @@ AdvSceneSwitcher.action.variable.conditionNoVariableSupport="Obter valores de va
 AdvSceneSwitcher.action.variable.currentSegmentValue="Valor atual:"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}de{{variables}}para comprimento{{stringLength}}adicionando{{paddingCharSelection}}ao{{direction}}"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}de{{variables}}para comprimento{{stringLength}}removendo caracteres da{{direction}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Início da substring:{{subStringStart}}Tamanho da substring:{{subStringSize}}{{subStringRegex}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Atribuir valor do{{regexMatchIdx}}correspondência usando expressão regular:{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringIndex="Início da substring:{{subStringStart}}Tamanho da substring:{{subStringSize}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="Atribuir valor do{{regexMatchIdx}}correspondência usando expressão regular:"
 AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Usar prompt personalizado{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Preencher com placeholder{{inputPlaceholder}}"
@@ -1065,8 +1065,8 @@ AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.enable="Habilitar modo apenas
 AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable="Desabilitar modo apenas emotes no chat"
 AdvSceneSwitcher.action.twitch.type.chat.sendMessage="Enviar mensagem de chat"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Não é possível selecionar categoria sem selecionar uma conta Twitch primeiro!"
-AdvSceneSwitcher.action.twitch.layout.default="Em{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.layout.chat="Usando conta{{account}}{{actions}}em{{channel}}"
+AdvSceneSwitcher.action.twitch.entry.default="Em{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
+AdvSceneSwitcher.action.twitch.entry.chat="Usando conta{{account}}{{actions}}em{{channel}}"
 AdvSceneSwitcher.action.twitch.title.title="Digite o título"
 AdvSceneSwitcher.action.twitch.marker.description="Descreva o marcador"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="Adicionar um leve atraso antes de capturar o clipe"
--- a/data/locale/zh-CN.ini
+++ b/data/locale/zh-CN.ini
@@ -1100,8 +1100,8 @@ AdvSceneSwitcher.action.variable.conditionNoVariableSupport="不支持从 %1 条
 AdvSceneSwitcher.action.variable.currentSegmentValue="当前值:"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}于{{variables}}的{{direction}}起，内容为{{paddingCharSelection}}将其变量值长度增加至{{stringLength}}."
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}于{{variables}}的{{direction}}起，将变量长度缩减至{{stringLength}}"
-AdvSceneSwitcher.action.variable.layout.substringIndex="截取字符串开始位置:{{subStringStart}} 截取字符串长度:{{subStringSize}}{{subStringRegex}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="使用正则表达式为 {{regexMatchIdx}} 匹配的值:{{subStringRegex}}"
+AdvSceneSwitcher.action.variable.layout.substringIndex="截取字符串开始位置:{{subStringStart}} 截取字符串长度:{{subStringSize}}"
+AdvSceneSwitcher.action.variable.layout.substringRegex="使用正则表达式为 {{regexMatchIdx}} 匹配的值:"
 AdvSceneSwitcher.action.variable.layout.findAndReplace="{{findStr}}{{findRegex}}{{replaceStr}}"
 AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}使用自定义提示{{inputPrompt}}"
 AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}用占位符填充{{inputPlaceholder}}"
@@ -1139,10 +1139,10 @@ AdvSceneSwitcher.action.twitch.type.user.getInfo="获取用户信息"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="获取频道积分奖励信息"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="切换奖励名称/变量选择控制"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="在未选择 Twitch 帐户的情况下无法选择类别!"
-AdvSceneSwitcher.action.twitch.layout.default="{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
-AdvSceneSwitcher.action.twitch.layout.chat="使用账户{{account}}{{actions}}{{channel}}"
-AdvSceneSwitcher.action.twitch.layout.user.getInfo="使用账户{{account}}{{actions}}{{userInfoQueryType}}{{userLogin}}{{userId}}"
-AdvSceneSwitcher.action.twitch.layout.reward.getInfo="使用账户{{account}}{{actions}} 频道{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
+AdvSceneSwitcher.action.twitch.entry.default="{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}{{pointsReward}}"
+AdvSceneSwitcher.action.twitch.entry.chat="使用账户{{account}}{{actions}}{{channel}}"
+AdvSceneSwitcher.action.twitch.entry.user.getInfo="使用账户{{account}}{{actions}}{{userInfoQueryType}}{{userLogin}}{{userId}}"
+AdvSceneSwitcher.action.twitch.entry.reward.getInfo="使用账户{{account}}{{actions}} 频道{{channel}}{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
 AdvSceneSwitcher.action.twitch.title.title="输入标题"
 AdvSceneSwitcher.action.twitch.marker.description="标记描述"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="在捕捉视频片段前稍加延迟"
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -68,22 +68,10 @@
            <x>0</x>
            <y>0</y>
            <width>962</width>
-            <height>1142</height>
+            <height>1132</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_19">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
           <item>
            <widget class="QGroupBox" name="statusBox">
             <property name="title">
@@ -280,19 +268,9 @@
               </widget>
              </item>
              <item>
-               <widget class="QCheckBox" name="alwaysShowMacroSearch">
+               <widget class="QCheckBox" name="uiHintsDisable">
                <property name="text">
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="alwaysShowFeatureTabs">
-                <property name="toolTip">
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs.tooltip</string>
-                </property>
-                <property name="text">
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs</string>
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints</string>
                </property>
               </widget>
              </item>
@@ -304,9 +282,9 @@
               </widget>
              </item>
              <item>
-               <widget class="QCheckBox" name="uiHintsDisable">
+               <widget class="QCheckBox" name="alwaysShowMacroSearch">
                <property name="text">
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints</string>
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch</string>
                </property>
               </widget>
              </item>
@@ -602,8 +580,11 @@
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-         <widget class="QWidget" name="wrapper">
-          <layout class="QVBoxLayout" name="verticalLayout_10">
+         <widget class="QGroupBox" name="groupBox_5">
+          <property name="title">
+           <string>AdvSceneSwitcher.macroTab.macros</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_36">
           <item>
            <widget class="QLabel" name="macroPriorityWarning">
             <property name="text">
@@ -686,34 +667,66 @@
            </widget>
           </item>
           <item>
-            <widget class="QToolBar" name="macrosToolbar">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="iconSize">
-              <size>
-               <width>16</width>
-               <height>16</height>
-              </size>
-             </property>
-             <property name="floatable">
-              <bool>false</bool>
-             </property>
-             <addaction name="macroAdd"/>
-             <addaction name="macroRemove"/>
-             <addaction name="separator"/>
-             <addaction name="macroUp"/>
-             <addaction name="macroDown"/>
-            </widget>
+            <layout class="QHBoxLayout" name="macroControlLayout">
+             <item>
+              <widget class="QToolButton" name="macroAdd">
+               <property name="toolTip">
+                <string>AdvSceneSwitcher.macroTab.tooltip.macroAddButton</string>
+               </property>
+               <property name="themeID" stdset="0">
+                <string notr="true">addIconSmall</string>
+               </property>
+               <property name="class" stdset="0">
+                <string notr="true">icon-plus</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="macroRemove">
+               <property name="toolTip">
+                <string>AdvSceneSwitcher.macroTab.tooltip.macroRemoveButton</string>
+               </property>
+               <property name="themeID" stdset="0">
+                <string notr="true">removeIconSmall</string>
+               </property>
+               <property name="class" stdset="0">
+                <string notr="true">icon-trash</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="macroUp">
+               <property name="toolTip">
+                <string>AdvSceneSwitcher.macroTab.tooltip.macroUpButton</string>
+               </property>
+               <property name="themeID" stdset="0">
+                <string notr="true">upArrowIconSmall</string>
+               </property>
+               <property name="class" stdset="0">
+                <string notr="true">icon-up</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="macroDown">
+               <property name="toolTip">
+                <string>AdvSceneSwitcher.macroTab.tooltip.macroDownButton</string>
+               </property>
+               <property name="themeID" stdset="0">
+                <string notr="true">downArrowIconSmall</string>
+               </property>
+               <property name="class" stdset="0">
+                <string notr="true">icon-down</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
           </item>
          </layout>
         </widget>
         <widget class="QGroupBox" name="macroEditGroup">
          <property name="title">
-           <string>AdvSceneSwitcher.macroTab.title</string>
+           <string>AdvSceneSwitcher.macroTab.edit</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_38">
           <item>
@@ -4022,78 +4035,6 @@
    </widget>
   </item>
  </layout>
-  <action name="macroAdd">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/res/images/plus.svg</normaloff>:/res/images/plus.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Add</string>
-   </property>
-   <property name="toolTip">
-    <string>AdvSceneSwitcher.macroTab.tooltip.macroAddButton</string>
-   </property>
-   <property name="class" stdset="0">
-    <string notr="true">icon-plus</string>
-   </property>
-   <property name="themeID" stdset="0">
-    <string notr="true">addIconSmall</string>
-   </property>
-  </action>
-  <action name="macroRemove">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/res/images/minus.svg</normaloff>:/res/images/minus.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Remove</string>
-   </property>
-   <property name="toolTip">
-    <string>AdvSceneSwitcher.macroTab.tooltip.macroRemoveButton</string>
-   </property>
-   <property name="shortcut">
-    <string>Del</string>
-   </property>
-   <property name="shortcutContext">
-    <enum>Qt::WidgetWithChildrenShortcut</enum>
-   </property>
-   <property name="iconVisibleInMenu">
-    <bool>false</bool>
-   </property>
-   <property name="class" stdset="0">
-    <string notr="true">icon-trash</string>
-   </property>
-  </action>
-  <action name="macroUp">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/res/images/up.svg</normaloff>:/res/images/up.svg</iconset>
-   </property>
-   <property name="text">
-    <string>MoveUp</string>
-   </property>
-   <property name="toolTip">
-    <string>AdvSceneSwitcher.macroTab.tooltip.macroUpButton</string>
-   </property>
-   <property name="class" stdset="0">
-    <string notr="true">icon-up</string>
-   </property>
-  </action>
-  <action name="macroDown">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/res/images/down.svg</normaloff>:/res/images/down.svg</iconset>
-   </property>
-   <property name="text">
-    <string>MoveDown</string>
-   </property>
-   <property name="toolTip">
-    <string>AdvSceneSwitcher.macroTab.tooltip.macroDownButton</string>
-   </property>
-   <property name="class" stdset="0">
-    <string notr="true">icon-down</string>
-   </property>
-  </action>
 </widget>
 <customwidgets>
  <customwidget>
@@ -4159,6 +4100,11 @@
  <tabstop>priorityUp</tabstop>
  <tabstop>priorityDown</tabstop>
  <tabstop>threadPriority</tabstop>
+  <tabstop>macros</tabstop>
+  <tabstop>macroAdd</tabstop>
+  <tabstop>macroRemove</tabstop>
+  <tabstop>macroUp</tabstop>
+  <tabstop>macroDown</tabstop>
  <tabstop>macroName</tabstop>
  <tabstop>runMacro</tabstop>
  <tabstop>runMacroInParallel</tabstop>
--- a/lib/advanced-scene-switcher.cpp
+++ b/lib/advanced-scene-switcher.cpp
@@ -1,6 +1,5 @@
 #include "advanced-scene-switcher.hpp"
 #include "backup.hpp"
-#include "crash-handler.hpp"
 #include "log-helper.hpp"
 #include "macro-helpers.hpp"
 #include "obs-module-helper.hpp"
@@ -208,15 +207,9 @@ static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *)
 		switcher->LoadSettings(data);
 		switcher->m.unlock();

-		if (switcher->stop) {
-			return;
+		if (!switcher->stop) {
+			switcher->Start();
 		}
-
-		if (ShouldSkipPluginStartOnUncleanShutdown()) {
-			return;
-		}
-
-		switcher->Start();
 	}
 }

--- a/lib/advanced-scene-switcher.hpp
+++ b/lib/advanced-scene-switcher.hpp
@@ -101,10 +101,10 @@ public:
 	void HighlightMacroSettingsButton(bool enable = true);

 public slots:
-	void on_macroAdd_triggered();
-	void on_macroRemove_triggered();
-	void on_macroUp_triggered() const;
-	void on_macroDown_triggered() const;
+	void on_macroAdd_clicked();
+	void on_macroRemove_clicked();
+	void on_macroUp_clicked() const;
+	void on_macroDown_clicked() const;
 	void on_macroName_editingFinished();
 	void on_runMacroInParallel_stateChanged(int value) const;
 	void on_runMacroOnChange_stateChanged(int value) const;
--- a/lib/general.cpp
+++ b/lib/general.cpp
@@ -1029,8 +1029,6 @@ void AdvSceneSwitcher::SetupGeneralTab()
 	setTabOrder(ui->importSettings, ui->cooldownTime);
 	setTabOrder(ui->cooldownTime, ui->noMatchDontSwitch);

-	SetupShowAllTabsCheckBox(ui->alwaysShowFeatureTabs, ui->tabWidget);
-
 	MinimizeSizeOfColumn(ui->statusLayout, 0);
 	setWindowTitle(windowTitle() + " - " + g_GIT_TAG);
 }
--- a/lib/macro/macro-action-macro.cpp
+++ b/lib/macro/macro-action-macro.cpp
@@ -93,46 +93,33 @@ bool MacroActionMacro::PerformAction()
 		return true;
 	}

-	const auto performActionForMacro = [this](Macro *macro) {
-		switch (_action) {
-		case Action::PAUSE:
-			macro->SetPaused();
-			break;
-		case Action::UNPAUSE:
-			macro->SetPaused(false);
-			break;
-		case Action::TOGGLE_PAUSE:
-			macro->SetPaused(!macro->Paused());
-			break;
-		case Action::RESET_COUNTER:
-			macro->ResetRunCount();
-			break;
-		case Action::RUN_ACTIONS:
-			RunActions(macro);
-			break;
-		case Action::STOP:
-			macro->Stop();
-			break;
-		case Action::DISABLE_ACTION:
-		case Action::ENABLE_ACTION:
-		case Action::TOGGLE_ACTION:
-			AdjustActionState(macro);
-			break;
-		default:
-			break;
-		}
-	};
-
-	if (!IsGroupMacro(macro.get())) {
-		performActionForMacro(macro.get());
-		return true;
+	switch (_action) {
+	case Action::PAUSE:
+		macro->SetPaused();
+		break;
+	case Action::UNPAUSE:
+		macro->SetPaused(false);
+		break;
+	case Action::TOGGLE_PAUSE:
+		macro->SetPaused(!macro->Paused());
+		break;
+	case Action::RESET_COUNTER:
+		macro->ResetRunCount();
+		break;
+	case Action::RUN_ACTIONS:
+		RunActions(macro.get());
+		break;
+	case Action::STOP:
+		macro->Stop();
+		break;
+	case Action::DISABLE_ACTION:
+	case Action::ENABLE_ACTION:
+	case Action::TOGGLE_ACTION:
+		AdjustActionState(macro.get());
+		break;
+	default:
+		break;
 	}
-
-	auto macros = GetGroupMacroEntries(macro.get());
-	for (const auto &macro : macros) {
-		performActionForMacro(macro.get());
-	}
-
 	return true;
 }

@@ -417,7 +404,6 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	populateActionTypes(_actionTypes);

 	_conditionMacros->HideSelectedMacro();
-	_conditionMacros->HideGroups();

 	QWidget::connect(_macros, SIGNAL(currentTextChanged(const QString &)),
 			 this, SLOT(MacroChanged(const QString &)));
--- a/lib/macro/macro-action-variable.cpp
+++ b/lib/macro/macro-action-variable.cpp
@@ -801,10 +801,11 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	  _segmentValueStatus(new QLabel()),
 	  _segmentValue(new ResizingPlainTextEdit(this, 10, 1, 1)),
 	  _substringLayout(new QVBoxLayout()),
-	  _subStringControlsLayout(new QHBoxLayout()),
+	  _subStringIndexEntryLayout(new QHBoxLayout()),
+	  _subStringRegexEntryLayout(new QHBoxLayout()),
 	  _subStringStart(new VariableSpinBox(this)),
 	  _subStringSize(new VariableSpinBox(this)),
-	  _subStringRegex(new RegexConfigWidget(parent)),
+	  _substringRegex(new RegexConfigWidget(parent)),
 	  _regexPattern(new ResizingPlainTextEdit(this, 10, 1, 1)),
 	  _regexMatchIdx(new VariableSpinBox(this)),
 	  _findReplaceLayout(new QHBoxLayout()),
@@ -900,7 +901,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		_subStringSize,
 		SIGNAL(NumberVariableChanged(const NumberVariable<int> &)),
 		this, SLOT(SubStringSizeChanged(const NumberVariable<int> &)));
-	QWidget::connect(_subStringRegex,
+	QWidget::connect(_substringRegex,
 			 SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
 			 SLOT(SubStringRegexChanged(const RegexConfig &)));
 	QWidget::connect(_regexPattern, SIGNAL(textChanged()), this,
@@ -974,6 +975,9 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		{"{{strValue}}", _strValue},
 		{"{{numValue}}", _numValue},
 		{"{{segmentIndex}}", _segmentIdx},
+		{"{{subStringStart}}", _subStringStart},
+		{"{{subStringSize}}", _subStringSize},
+		{"{{regexMatchIdx}}", _regexMatchIdx},
 		{"{{findRegex}}", _findRegex},
 		{"{{findStr}}", _findStr},
 		{"{{replaceStr}}", _replaceStr},
@@ -1005,7 +1009,12 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	PlaceWidgets(
 		obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.substringIndex"),
-		_subStringControlsLayout, widgetPlaceholders);
+		_subStringIndexEntryLayout, widgetPlaceholders);
+
+	PlaceWidgets(
+		obs_module_text(
+			"AdvSceneSwitcher.action.variable.layout.substringRegex"),
+		_subStringRegexEntryLayout, widgetPlaceholders);

 	PlaceWidgets(
 		obs_module_text(
@@ -1030,10 +1039,11 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	_randomLayout->addWidget(_generateInteger);

 	auto regexConfigLayout = new QHBoxLayout;
-	regexConfigLayout->addWidget(_subStringRegex);
+	regexConfigLayout->addWidget(_substringRegex);
 	regexConfigLayout->addStretch();

-	_substringLayout->addLayout(_subStringControlsLayout);
+	_substringLayout->addLayout(_subStringIndexEntryLayout);
+	_substringLayout->addLayout(_subStringRegexEntryLayout);
 	_substringLayout->addWidget(_regexPattern);
 	_substringLayout->addLayout(regexConfigLayout);

@@ -1080,7 +1090,7 @@ void MacroActionVariableEdit::UpdateEntryData()
 			: MacroSegmentSelection::Type::ACTION);
 	_subStringStart->SetValue(_entryData->_subStringStart);
 	_subStringSize->SetValue(_entryData->_subStringSize);
-	_subStringRegex->SetRegexConfig(_entryData->_subStringRegex);
+	_substringRegex->SetRegexConfig(_entryData->_subStringRegex);
 	_findRegex->SetRegexConfig(_entryData->_findRegex);
 	_regexPattern->setPlainText(
 		QString::fromStdString(_entryData->_regexPattern));
@@ -1485,20 +1495,8 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		{"{{jsonQuery}}", _jsonQuery},
 		{"{{jsonQueryHelp}}", _jsonQueryHelp},
 		{"{{jsonIndex}}", _jsonIndex},
-		{"{{subStringRegex}}", _subStringRegex},
-		{"{{subStringStart}}", _subStringStart},
-		{"{{subStringSize}}", _subStringSize},
-		{"{{regexMatchIdx}}", _regexMatchIdx},
 	};

-	for (const auto &[_, widget] : widgetPlaceholders) {
-		_entryLayout->removeWidget(widget);
-		_subStringControlsLayout->removeWidget(widget);
-	}
-
-	ClearLayout(_entryLayout);
-	ClearLayout(_subStringControlsLayout);
-
 	const char *layoutString = "";
 	if (_entryData->_action == MacroActionVariable::Action::PAD) {
 		layoutString = obs_module_text(
@@ -1512,6 +1510,11 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 			"AdvSceneSwitcher.action.variable.layout.other");
 	}

+	for (const auto &[_, widget] : widgetPlaceholders) {
+		_entryLayout->removeWidget(widget);
+	}
+
+	ClearLayout(_entryLayout);
 	PlaceWidgets(layoutString, _entryLayout, widgetPlaceholders);

 	if (_entryData->_action == MacroActionVariable::Action::SET_VALUE ||
@@ -1558,25 +1561,15 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 			MacroActionVariable::Action::SET_ACTION_VALUE ||
 		_entryData->_action ==
 			MacroActionVariable::Action::SET_CONDITION_VALUE);
-
-	bool showRegex = _entryData->_subStringRegex.Enabled();
-	layoutString =
-		showRegex
-			? "AdvSceneSwitcher.action.variable.layout.substringRegex"
-			: "AdvSceneSwitcher.action.variable.layout.substringIndex";
-	PlaceWidgets(obs_module_text(layoutString), _subStringControlsLayout,
-		     widgetPlaceholders);
-	_subStringStart->setVisible(!showRegex);
-	_subStringSize->setVisible(!showRegex);
-	_regexMatchIdx->setVisible(showRegex);
-
 	SetLayoutVisible(_substringLayout,
 			 _entryData->_action ==
 				 MacroActionVariable::Action::SUBSTRING);
-	_regexPattern->setVisible(
-		showRegex &&
-		_entryData->_action == MacroActionVariable::Action::SUBSTRING);
-
+	if (_entryData->_action == MacroActionVariable::Action::SUBSTRING) {
+		bool showRegex = _entryData->_subStringRegex.Enabled();
+		SetLayoutVisible(_subStringIndexEntryLayout, !showRegex);
+		SetLayoutVisible(_subStringRegexEntryLayout, showRegex);
+		_regexPattern->setVisible(showRegex);
+	}
 	SetLayoutVisible(_findReplaceLayout,
 			 _entryData->_action ==
 				 MacroActionVariable::Action::FIND_AND_REPLACE);
--- a/lib/macro/macro-action-variable.hpp
+++ b/lib/macro/macro-action-variable.hpp
@@ -194,10 +194,11 @@ private:
 	QLabel *_segmentValueStatus;
 	ResizingPlainTextEdit *_segmentValue;
 	QVBoxLayout *_substringLayout;
-	QHBoxLayout *_subStringControlsLayout;
+	QHBoxLayout *_subStringIndexEntryLayout;
+	QHBoxLayout *_subStringRegexEntryLayout;
 	VariableSpinBox *_subStringStart;
 	VariableSpinBox *_subStringSize;
-	RegexConfigWidget *_subStringRegex;
+	RegexConfigWidget *_substringRegex;
 	ResizingPlainTextEdit *_regexPattern;
 	VariableSpinBox *_regexMatchIdx;
 	QHBoxLayout *_findReplaceLayout;
--- a/lib/macro/macro-condition-macro.cpp
+++ b/lib/macro/macro-condition-macro.cpp
@@ -315,7 +315,6 @@ MacroConditionMacroEdit::MacroConditionMacroEdit(
 	  _actionIndex(new MacroSegmentSelection(
 		  this, MacroSegmentSelection::Type::ACTION))
 {
-	_macros->HideGroups();
 	_count->setMaximum(10000000);
 	populateTypeSelection(_types);
 	populateCounterConditionSelection(_counterConditions);
--- a/lib/macro/macro-helpers.cpp
+++ b/lib/macro/macro-helpers.cpp
@@ -117,32 +117,9 @@ GetMacroConditions(Macro *macro)
 	return macro->Conditions();
 }

-bool IsGroupMacro(Macro *macro)
+std::string_view GetSceneSwitchActionId()
 {
-	return macro && macro->IsGroup();
-}
-
-std::vector<std::shared_ptr<Macro>> GetGroupMacroEntries(Macro *macro)
-{
-	if (!macro || !macro->IsGroup()) {
-		return {};
-	}
-
-	std::vector<std::shared_ptr<Macro>> entries;
-	entries.reserve(macro->GroupSize());
-
-	const auto &macros = GetTopLevelMacros();
-	for (auto it = macros.begin(); it < macros.end(); it++) {
-		if ((*it)->Name() != macro->Name()) {
-			continue;
-		}
-		for (uint32_t i = 1; i <= macro->GroupSize(); i++) {
-			entries.emplace_back(*std::next(it, i));
-		}
-		break;
-	}
-
-	return entries;
+	return MacroAction::GetDefaultID();
 }

 std::condition_variable &GetMacroWaitCV()
--- a/lib/macro/macro-helpers.hpp
+++ b/lib/macro/macro-helpers.hpp
@@ -20,8 +20,6 @@ class Macro;
 class MacroAction;
 class MacroCondition;

-static const int macro_func = 10;
-
 EXPORT std::deque<std::shared_ptr<Macro>> &GetTopLevelMacros();
 std::deque<std::shared_ptr<Macro>> &GetTemporaryMacros();
 EXPORT std::deque<std::shared_ptr<Macro>> GetAllMacros();
@@ -37,8 +35,9 @@ GetMacroElseActions(Macro *);
 EXPORT std::optional<std::deque<std::shared_ptr<MacroCondition>>>
 GetMacroConditions(Macro *);

-EXPORT bool IsGroupMacro(Macro *);
-EXPORT std::vector<std::shared_ptr<Macro>> GetGroupMacroEntries(Macro *);
+std::string_view GetSceneSwitchActionId();
+
+constexpr auto macro_func = 10;

 EXPORT std::condition_variable &GetMacroWaitCV();
 EXPORT std::condition_variable &GetMacroTransitionCV();
--- a/lib/macro/macro-search.cpp
+++ b/lib/macro/macro-search.cpp
@@ -244,9 +244,22 @@ bool MacroMatchesSearchFilter(Macro *macro)
 	}

 	if (macro->IsGroup()) {
-		const auto groupEntries = GetGroupMacroEntries(macro);
-		for (const auto &entry : groupEntries) {
-			if (MacroMatchesSearchFilter(entry.get())) {
+		std::vector<std::shared_ptr<Macro>> subItems;
+		subItems.reserve(macro->GroupSize());
+
+		const auto &macros = GetTopLevelMacros();
+		for (auto it = macros.begin(); it < macros.end(); it++) {
+			if ((*it)->Name() != macro->Name()) {
+				continue;
+			}
+			for (uint32_t i = 1; i <= macro->GroupSize(); i++) {
+				subItems.emplace_back(*std::next(it, i));
+			}
+			break;
+		}
+
+		for (const auto &item : subItems) {
+			if (MacroMatchesSearchFilter(item.get())) {
 				return true;
 			}
 		}
--- a/lib/macro/macro-selection.cpp
+++ b/lib/macro/macro-selection.cpp
@@ -15,6 +15,9 @@ MacroSelection::MacroSelection(QWidget *parent)
 			 obs_module_text("AdvSceneSwitcher.selectMacro"))
 {
 	for (const auto &m : GetTopLevelMacros()) {
+		if (m->IsGroup()) {
+			continue;
+		}
 		addItem(QString::fromStdString(m->Name()));
 	}

@@ -63,22 +66,6 @@ void MacroSelection::HideSelectedMacro()
 	qobject_cast<QListView *>(view())->setRowHidden(idx, true);
 }

-void MacroSelection::HideGroups()
-{
-	for (const auto &macro : GetTopLevelMacros()) {
-		if (!macro->IsGroup()) {
-			continue;
-		}
-
-		int idx = findText(QString::fromStdString(macro->Name()));
-		if (idx == -1) {
-			continue;
-		}
-
-		qobject_cast<QListView *>(view())->setRowHidden(idx, true);
-	}
-}
-
 void MacroSelection::ShowAllMacros()
 {
 	auto v = qobject_cast<QListView *>(view());
--- a/lib/macro/macro-selection.hpp
+++ b/lib/macro/macro-selection.hpp
@@ -15,7 +15,6 @@ public:
 	MacroSelection(QWidget *parent);
 	void SetCurrentMacro(const MacroRef &);
 	void HideSelectedMacro(); // Macro currently being edited
-	void HideGroups();
 	void ShowAllMacros();

 private slots:
--- a/lib/macro/macro-tab.cpp
+++ b/lib/macro/macro-tab.cpp
@@ -97,7 +97,7 @@ bool AdvSceneSwitcher::AddNewMacro(std::shared_ptr<Macro> &res,
 	return true;
 }

-void AdvSceneSwitcher::on_macroAdd_triggered()
+void AdvSceneSwitcher::on_macroAdd_clicked()
 {
 	// Hotkey to add new macro will also use this function.
 	// Since we don't want the hotkey to have an effect if the macro tab is
@@ -147,7 +147,20 @@ void AdvSceneSwitcher::on_macroAdd_triggered()
 static void addGroupSubitems(std::vector<std::shared_ptr<Macro>> &macros,
 			     const std::shared_ptr<Macro> &group)
 {
-	auto subitems = GetGroupMacroEntries(group.get());
+	std::vector<std::shared_ptr<Macro>> subitems;
+	subitems.reserve(group->GroupSize());
+
+	// Find all subitems
+	auto allMacros = GetTopLevelMacros();
+	for (auto it = allMacros.begin(); it < allMacros.end(); it++) {
+		if ((*it)->Name() != group->Name()) {
+			continue;
+		}
+		for (uint32_t i = 1; i <= group->GroupSize(); i++) {
+			subitems.emplace_back(*std::next(it, i));
+		}
+		break;
+	}

 	// Remove subitems which were already selected to avoid duplicates
 	for (const auto &subitem : subitems) {
@@ -247,12 +260,12 @@ void AdvSceneSwitcher::RenameMacro(std::shared_ptr<Macro> &macro,
 	MacroSignalManager::Instance()->Rename(oldName, name);
 }

-void AdvSceneSwitcher::on_macroRemove_triggered()
+void AdvSceneSwitcher::on_macroRemove_clicked()
 {
 	RemoveSelectedMacros();
 }

-void AdvSceneSwitcher::on_macroUp_triggered() const
+void AdvSceneSwitcher::on_macroUp_clicked() const
 {
 	auto macro = GetSelectedMacro();
 	if (!macro) {
@@ -261,7 +274,7 @@ void AdvSceneSwitcher::on_macroUp_triggered() const
 	ui->macros->Up(macro);
 }

-void AdvSceneSwitcher::on_macroDown_triggered() const
+void AdvSceneSwitcher::on_macroDown_clicked() const
 {
 	auto macro = GetSelectedMacro();
 	if (!macro) {
@@ -632,11 +645,13 @@ void AdvSceneSwitcher::SetupMacroTab()
 	auto &macros = GetTopLevelMacros();

 	if (macros.size() == 0 && !switcher->disableHints) {
-		addPulse = HighlightWidget(
-			ui->macrosToolbar->widgetForAction(ui->macroAdd),
-			QColor(Qt::green));
+		addPulse = HighlightWidget(ui->macroAdd, QColor(Qt::green));
 	}

+	auto macroControls = setupToolBar({{ui->macroAdd, ui->macroRemove},
+					   {ui->macroUp, ui->macroDown}});
+	ui->macroControlLayout->addWidget(macroControls);
+
 	ui->macros->Reset(macros, GetGlobalMacroSettings()._highlightExecuted);
 	connect(ui->macros, SIGNAL(MacroSelectionChanged()), this,
 		SLOT(MacroSelectionChanged()));
@@ -681,7 +696,7 @@ void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)

 	menu.addAction(
 		obs_module_text("AdvSceneSwitcher.macroTab.contextMenuAdd"),
-		this, &AdvSceneSwitcher::on_macroAdd_triggered);
+		this, &AdvSceneSwitcher::on_macroAdd_clicked);

 	auto copy = menu.addAction(
 		obs_module_text("AdvSceneSwitcher.macroTab.copy"), this,
@@ -697,7 +712,7 @@ void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)

 	auto remove = menu.addAction(
 		obs_module_text("AdvSceneSwitcher.macroTab.remove"), this,
-		&AdvSceneSwitcher::on_macroRemove_triggered);
+		&AdvSceneSwitcher::on_macroRemove_clicked);
 	remove->setDisabled(ui->macros->SelectionEmpty());
 	menu.addSeparator();

--- a/lib/macro/macro-tree.cpp
+++ b/lib/macro/macro-tree.cpp
@@ -62,11 +62,12 @@ MacroTreeItem::MacroTreeItem(MacroTree *tree, std::shared_ptr<Macro> macroItem,

 	_boxLayout = new QHBoxLayout();
 	_boxLayout->setContentsMargins(0, 0, 0, 0);
+	_boxLayout->addWidget(_running);
 	if (isGroup) {
 		_boxLayout->addWidget(_iconLabel);
 		_boxLayout->addSpacing(2);
+		_running->hide();
 	}
-	_boxLayout->addWidget(_running);
 	_boxLayout->addWidget(_label);
 #ifdef __APPLE__
 	/* Hack: Fixes a bug where scrollbars would be above the lock icon */
@@ -76,17 +77,17 @@ MacroTreeItem::MacroTreeItem(MacroTree *tree, std::shared_ptr<Macro> macroItem,
 	Update(true);
 	setLayout(_boxLayout);

-	connect(_running, SIGNAL(clicked(bool)), this,
-		SLOT(RunningClicked(bool)));
+	auto setRunning = [this](bool val) {
+		_macro->SetPaused(!val);
+	};
+	connect(_running, &QAbstractButton::clicked, setRunning);
 	connect(MacroSignalManager::Instance(), SIGNAL(HighlightChanged(bool)),
 		this, SLOT(EnableHighlight(bool)));
 	connect(MacroSignalManager::Instance(),
 		SIGNAL(Rename(const QString &, const QString &)), this,
 		SLOT(MacroRenamed(const QString &, const QString &)));
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(HighlightIfExecuted()));
-	connect(&_timer, SIGNAL(timeout()), this, SLOT(UpdateRunning()));
-
-	UpdateRunning();
+	connect(&_timer, SIGNAL(timeout()), this, SLOT(UpdatePaused()));
 	_timer.start(1500);
 }

@@ -95,90 +96,10 @@ void MacroTreeItem::EnableHighlight(bool enable)
 	_highlight = enable;
 }

-void MacroTreeItem::RunningClicked(bool running)
-{
-	const auto updateWidget = [this](Macro *macro) {
-		if (!macro) {
-			return;
-		}
-
-		const auto &macros = GetTopLevelMacros();
-
-		bool found = false;
-		int idx = 0;
-		for (const auto &m : macros) {
-			if (m.get() == macro) {
-				found = true;
-				break;
-			}
-			idx++;
-		}
-
-		if (!found) {
-			return;
-		}
-
-		const auto widget = _tree->GetItemWidget(idx);
-		if (widget) {
-			widget->UpdateRunning();
-		}
-	};
-
-	if (!_macro->IsGroup()) {
-		_macro->SetPaused(!running);
-		if (!_macro->IsSubitem()) {
-			return;
-		}
-
-		const auto group = _macro->Parent();
-		updateWidget(group.get());
-		return;
-	}
-
-	const auto macros = GetGroupMacroEntries(_macro.get());
-	for (const auto &macro : macros) {
-		macro->SetPaused(!running);
-	}
-
-	// Update backend values before updating UI to prevent flickering in
-	// running state of the group
-	for (const auto &macro : macros) {
-		updateWidget(macro.get());
-	}
-	UpdateRunning();
-}
-
-void MacroTreeItem::UpdateRunning()
+void MacroTreeItem::UpdatePaused()
 {
 	const QSignalBlocker blocker(_running);
-
-	if (!_macro->IsGroup()) {
-		_running->setChecked(!_macro->Paused());
-		return;
-	}
-
-	const auto macros = GetGroupMacroEntries(_macro.get());
-	bool allRunning = true;
-	bool allPaused = true;
-	for (const auto &macro : macros) {
-		if (macro->Paused()) {
-			allRunning = false;
-		} else {
-			allPaused = false;
-		}
-	}
-
-	if (allRunning) {
-		_running->setCheckState(Qt::Checked);
-		return;
-	}
-
-	if (allPaused) {
-		_running->setCheckState(Qt::Unchecked);
-		return;
-	}
-
-	_running->setCheckState(Qt::PartiallyChecked);
+	_running->setChecked(!_macro->Paused());
 }

 void MacroTreeItem::HighlightIfExecuted()
@@ -293,6 +214,7 @@ void MacroTreeModel::Reset(std::deque<std::shared_ptr<Macro>> &newItems)
 	_macros = newItems;
 	endResetModel();

+	UpdateGroupState(false);
 	_mt->ResetWidgets();
 }

@@ -537,6 +459,9 @@ void MacroTreeModel::Remove(std::shared_ptr<Macro> item)

 	_mt->selectionModel()->clear();

+	if (isGroup) {
+		UpdateGroupState(true);
+	}
 	assert(IsInValidState());
 }

@@ -625,6 +550,7 @@ MacroTreeModel::MacroTreeModel(MacroTree *st_,
 	  _mt(st_),
 	  _macros(macros)
 {
+	UpdateGroupState(false);
 }

 int MacroTreeModel::rowCount(const QModelIndex &parent) const
@@ -778,6 +704,7 @@ void MacroTreeModel::GroupSelectedItems(QModelIndexList &indices)
 		offset++;
 	}

+	_hasGroups = true;
 	_mt->selectionModel()->clear();

 	Reset(_macros);
@@ -835,6 +762,24 @@ void MacroTreeModel::CollapseGroup(std::shared_ptr<Macro> item)
 	assert(IsInValidState());
 }

+void MacroTreeModel::UpdateGroupState(bool update)
+{
+	bool nowHasGroups = false;
+	for (auto &item : _macros) {
+		if (item->IsGroup()) {
+			nowHasGroups = true;
+			break;
+		}
+	}
+
+	if (nowHasGroups != _hasGroups) {
+		_hasGroups = nowHasGroups;
+		if (update) {
+			_mt->UpdateWidgets(true);
+		}
+	}
+}
+
 void MacroTree::Reset(std::deque<std::shared_ptr<Macro>> &macros,
 		      bool highlight)
 {
@@ -897,6 +842,7 @@ MacroTree::MacroTree(QWidget *parent_) : QListView(parent_)
 void MacroTree::ResetWidgets()
 {
 	MacroTreeModel *mtm = GetModel();
+	mtm->UpdateGroupState(false);
 	int modelIdx = 0;
 	for (int i = 0; i < (int)mtm->_macros.size(); i++) {
 		QModelIndex index = mtm->createIndex(modelIdx, 0, nullptr);
--- a/lib/macro/macro-tree.hpp
+++ b/lib/macro/macro-tree.hpp
@@ -37,8 +37,7 @@ public:
 private slots:
 	void ExpandClicked(bool checked);
 	void EnableHighlight(bool enable);
-	void RunningClicked(bool);
-	void UpdateRunning();
+	void UpdatePaused();
 	void HighlightIfExecuted();
 	void MacroRenamed(const QString &, const QString &);

@@ -107,6 +106,7 @@ private:
 	void UngroupSelectedGroups(QModelIndexList &indices);
 	void ExpandGroup(std::shared_ptr<Macro> item);
 	void CollapseGroup(std::shared_ptr<Macro> item);
+	void UpdateGroupState(bool update);
 	int GetItemMacroIndex(const std::shared_ptr<Macro> &item) const;
 	int GetItemModelIndex(const std::shared_ptr<Macro> &item) const;
 	bool IsLastItem(std::shared_ptr<Macro> item) const;
@@ -114,6 +114,7 @@ private:

 	MacroTree *_mt;
 	std::deque<std::shared_ptr<Macro>> &_macros;
+	bool _hasGroups = false;

 	friend class MacroTree;
 	friend class MacroTreeItem;
--- a/lib/macro/macro.cpp
+++ b/lib/macro/macro.cpp
@@ -948,12 +948,12 @@ bool Macro::PostLoad()
 bool Macro::SwitchesScene() const
 {
 	for (const auto &a : _actions) {
-		if (a->GetId() == MacroAction::GetDefaultID()) {
+		if (a->GetId() == GetSceneSwitchActionId()) {
 			return true;
 		}
 	}
 	for (const auto &a : _elseActions) {
-		if (a->GetId() == MacroAction::GetDefaultID()) {
+		if (a->GetId() == GetSceneSwitchActionId()) {
 			return true;
 		}
 	}
--- a/lib/utils/crash-handler.cpp
+++ b/lib/utils/crash-handler.cpp
@@ -1,135 +0,0 @@
-#include "crash-handler.hpp"
-#include "log-helper.hpp"
-#include "obs-module-helper.hpp"
-#include "plugin-state-helpers.hpp"
-#include "ui-helpers.hpp"
-
-#include <obs-frontend-api.h>
-#include <obs-module.h>
-
-#include <QDir>
-#include <QFile>
-
-#include <thread>
-
-namespace advss {
-
-static constexpr std::string_view sentinel = ".running";
-
-#ifndef NDEBUG
-static constexpr bool handleUncleanShutdown = false;
-#else
-static constexpr bool handleUncleanShutdown = true;
-#endif
-
-static bool wasCleanShutdown = false;
-
-static void setup();
-static bool setupDone = []() {
-	AddPluginInitStep(setup);
-	return true;
-}();
-
-static void handleShutdown(enum obs_frontend_event event, void *)
-{
-	if (event != OBS_FRONTEND_EVENT_EXIT) {
-		return;
-	}
-
-	char *sentinelFile = obs_module_config_path(sentinel.data());
-	if (!sentinelFile) {
-		return;
-	}
-
-	QFile file(sentinelFile);
-	if (!file.exists()) {
-		bfree(sentinelFile);
-		return;
-	}
-
-	if (!file.remove()) {
-		blog(LOG_WARNING, "failed to remove sentinel file");
-	}
-
-	bfree(sentinelFile);
-}
-
-static void setup()
-{
-	char *sentinelFile = obs_module_config_path(sentinel.data());
-	if (!sentinelFile) {
-		return;
-	}
-
-	QString dirPath = QFileInfo(sentinelFile).absolutePath();
-	QDir dir(dirPath);
-	if (!dir.exists()) {
-		if (!dir.mkpath(dirPath)) {
-			blog(LOG_WARNING,
-			     "failed to create directory for sentinel file");
-			bfree(sentinelFile);
-			return;
-		}
-	}
-
-	QFile file(sentinelFile);
-
-	wasCleanShutdown = file.exists();
-
-	if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-		blog(LOG_WARNING, "failed to create sentinel file");
-		bfree(sentinelFile);
-		return;
-	}
-
-	file.write("running");
-	file.close();
-	bfree(sentinelFile);
-
-	obs_frontend_add_event_callback(handleShutdown, nullptr);
-	return;
-}
-
-static bool wasUncleanShutdown()
-{
-	static bool alreadyHandled = false;
-
-	if (!handleUncleanShutdown || !wasCleanShutdown || alreadyHandled) {
-		alreadyHandled = true;
-		return false;
-	}
-
-	alreadyHandled = true;
-	blog(LOG_WARNING, "unclean shutdown detected");
-	return true;
-}
-
-static bool askForStartupSkip()
-{
-	return DisplayMessage(obs_module_text("AdvSceneSwitcher.crashDetected"),
-			      true, false);
-}
-
-bool ShouldSkipPluginStartOnUncleanShutdown()
-{
-	if (!wasUncleanShutdown()) {
-		return false;
-	}
-
-	std::thread t([]() {
-		obs_queue_task(
-			OBS_TASK_UI,
-			[](void *) {
-				const bool skipStart = askForStartupSkip();
-				if (!skipStart) {
-					StartPlugin();
-				}
-			},
-			nullptr, false);
-	});
-	t.detach();
-
-	return true;
-}
-
-} // namespace advss
--- a/lib/utils/crash-handler.hpp
+++ b/lib/utils/crash-handler.hpp
@@ -1,7 +0,0 @@
-#pragma once
-
-namespace advss {
-
-bool ShouldSkipPluginStartOnUncleanShutdown();
-
-} // namespace advss
--- a/lib/utils/resource-table.cpp
+++ b/lib/utils/resource-table.cpp
@@ -57,7 +57,6 @@ ResourceTable::ResourceTable(QWidget *parent, const QString &help,
 	auto layout = new QVBoxLayout();
 	layout->addLayout(helpAndTableLayout);
 	layout->addLayout(controlLayout);
-	layout->setContentsMargins(0, 0, 0, 0);
 	setLayout(layout);

 	QWidget::connect(_add, SIGNAL(clicked()), this, SLOT(Add()));
@@ -66,16 +65,13 @@ ResourceTable::ResourceTable(QWidget *parent, const QString &help,
 			 [openSettings]() { openSettings(); });

 	auto settingsShortcut = new QShortcut(QKeySequence("F2"), this);
-	settingsShortcut->setContext(Qt::WidgetWithChildrenShortcut);
 	QWidget::connect(settingsShortcut, &QShortcut::activated, this,
 			 openSettings);
 	auto removeShortcut = new QShortcut(QKeySequence("Del"), this);
-	removeShortcut->setContext(Qt::WidgetWithChildrenShortcut);
 	QWidget::connect(removeShortcut, &QShortcut::activated, this,
 			 [this]() { Remove(); });

 	auto newShortcut = new QShortcut(QKeySequence("Ctrl+N"), this);
-	newShortcut->setContext(Qt::WidgetWithChildrenShortcut);
 	QWidget::connect(newShortcut, &QShortcut::activated, this,
 			 [this]() { Add(); });
 }
--- a/lib/utils/source-helpers.cpp
+++ b/lib/utils/source-helpers.cpp
@@ -1,5 +1,4 @@
 #include "source-helpers.hpp"
-#include "canvas-helpers.hpp"

 #include <obs-frontend-api.h>

@@ -29,43 +28,15 @@ std::string GetWeakSourceName(obs_weak_source_t *weak_source)

 OBSWeakSource GetWeakSourceByName(const char *name)
 {
-	OBSSourceAutoRelease source = obs_get_source_by_name(name);
+	OBSWeakSource weak;
+	obs_source_t *source = obs_get_source_by_name(name);
 	if (source) {
-		return OBSGetWeakRef(source);
+		weak = obs_source_get_weak_source(source);
+		obs_weak_source_release(weak);
+		obs_source_release(source);
 	}

-#if LIBOBS_API_VER > MAKE_SEMANTIC_VERSION(31, 1, 0)
-	struct SearchData {
-		const char *name;
-		OBSWeakSource &scene;
-	};
-
-	static const auto enumCanvasScenes = [](void *dataPtr,
-						obs_source_t *source) -> bool {
-		auto data = static_cast<SearchData *>(dataPtr);
-		if (strcmp(data->name, obs_source_get_name(source)) == 0) {
-			data->scene = OBSGetWeakRef(source);
-			return false;
-		}
-
-		return true;
-	};
-
-	static const auto enumCanvases = [](void *dataPtr,
-					    obs_canvas_t *canvas) -> bool {
-		obs_canvas_enum_scenes(canvas, enumCanvasScenes, dataPtr);
-
-		auto data = static_cast<SearchData *>(dataPtr);
-		return data->scene == nullptr;
-	};
-
-	OBSWeakSource weakScene;
-	SearchData searchData{name, weakScene};
-	obs_enum_canvases(enumCanvases, &searchData);
-	return weakScene;
-#else
-	return nullptr;
-#endif
+	return weak;
 }

 OBSWeakSource GetWeakSourceByQString(const QString &name)
--- a/lib/utils/tab-helpers.cpp
+++ b/lib/utils/tab-helpers.cpp
@@ -1,7 +1,6 @@
 #include "tab-helpers.hpp"
 #include "log-helper.hpp"
 #include "obs-module-helper.hpp"
-#include "plugin-state-helpers.hpp"

 #include <obs.hpp>
 #include <QTabBar>
@@ -34,21 +33,6 @@ struct TabCallbacks {
 static std::unordered_map<const char *, TabCallbacks> createTabCallbacks;

 static int lastOpenedTab = -1;
-static bool alwaysShowTabs = false;
-
-[[maybe_unused]] static bool _ = []() {
-	AddPluginInitStep([]() {
-		AddSaveStep([](obs_data_t *data) {
-			obs_data_set_bool(data, "alwaysShowTabs",
-					  alwaysShowTabs);
-		});
-		AddLoadStep([](obs_data_t *data) {
-			alwaysShowTabs =
-				obs_data_get_bool(data, "alwaysShowTabs");
-		});
-	});
-	return true;
-}();

 void SetTabVisibleByName(QTabWidget *tabWidget, bool visible,
 			 const QString &name)
@@ -213,41 +197,7 @@ void SetupOtherTabs(QTabWidget *tabWidget)
 				.c_str());
 		tabWidget->insertTab(0, widget, tabText);
 		callbacks.setupTab(tabWidget);
-
-		if (alwaysShowTabs) {
-			tabWidget->setTabVisible(0, true);
-		}
 	}
 }

-void SetupShowAllTabsCheckBox(QCheckBox *checkBox, QTabWidget *tabWidget)
-{
-	const auto stateChanged = [tabWidget](int state) {
-		const bool newState = (state != 0);
-		if (newState == alwaysShowTabs) {
-			return;
-		}
-
-		alwaysShowTabs = newState;
-
-		// Only show currently hidden tabs, but don't hide tabs which
-		// are already visible
-		if (!alwaysShowTabs) {
-			return;
-		}
-
-		for (const auto &[name, _] : createTabCallbacks) {
-			const auto localeKey =
-				std::string("AdvSceneSwitcher.") + name +
-				".title";
-			auto tabText = obs_module_text(localeKey.c_str());
-			SetTabVisibleByName(tabWidget, true, tabText);
-		}
-	};
-
-	checkBox->setChecked(alwaysShowTabs);
-	QWidget::connect(checkBox, &QCheckBox::stateChanged, checkBox,
-			 stateChanged);
-}
-
 } // namespace advss
--- a/lib/utils/tab-helpers.hpp
+++ b/lib/utils/tab-helpers.hpp
@@ -2,8 +2,6 @@
 #include "export-symbol-helper.hpp"

 #include <obs-data.h>
-
-#include <QCheckBox>
 #include <QTabWidget>

 namespace advss {
@@ -21,6 +19,5 @@ void SetupOtherTabs(QTabWidget *tabWidget);
 void SaveTabOrder(obs_data_t *obj);
 void LoadTabOrder(obs_data_t *obj);
 bool MacroTabIsInFocus();
-void SetupShowAllTabsCheckBox(QCheckBox *checkBox, QTabWidget *tabWidget);

 } // namespace advss
--- a/lib/win/advanced-scene-switcher-win.cpp
+++ b/lib/win/advanced-scene-switcher-win.cpp
@@ -261,14 +261,6 @@ std::optional<std::string> GetTextInWindow(const std::string &window)
 		return {};
 	}

-	DWORD pid = 0;
-	DWORD thid = 0;
-	thid = GetWindowThreadProcessId(hwnd, &pid);
-	// Calling CoCreateInstance() on the OBS windows might cause a deadlock
-	if (GetCurrentProcessId() == pid) {
-		return {};
-	}
-
 	IUIAutomation *automation = nullptr;
 	auto hr = CoCreateInstance(__uuidof(CUIAutomation), nullptr,
 				   CLSCTX_INPROC_SERVER,
--- a/plugins/base/macro-action-sequence.cpp
+++ b/plugins/base/macro-action-sequence.cpp
@@ -194,7 +194,6 @@ MacroActionSequenceEdit::MacroActionSequenceEdit(
 	  _resetIndex(new VariableSpinBox()),
 	  _layout(new QHBoxLayout())
 {
-	_macros->HideGroups();
 	populateActionSelection(_actions);

 	_resetIndex->setMinimum(1);
--- a/plugins/base/macro-action-timer.cpp
+++ b/plugins/base/macro-action-timer.cpp
@@ -31,16 +31,15 @@ bool MacroActionTimer::PerformAction()
 	if (!macro) {
 		return true;
 	}
-
-	const auto updateCondition = [this](MacroCondition *condition) {
+	auto conditions = *GetMacroConditions(macro.get());
+	for (auto condition : conditions) {
 		if (condition->GetId() != id) {
-			return;
+			continue;
 		}
-
 		auto timerCondition =
-			dynamic_cast<MacroConditionTimer *>(condition);
+			dynamic_cast<MacroConditionTimer *>(condition.get());
 		if (!timerCondition) {
-			return;
+			continue;
 		}

 		switch (_actionType) {
@@ -60,23 +59,6 @@ bool MacroActionTimer::PerformAction()
 		default:
 			break;
 		}
-	};
-
-	const auto updateMacro = [&](Macro *macro) {
-		auto conditions = *GetMacroConditions(macro);
-		for (auto condition : conditions) {
-			updateCondition(condition.get());
-		}
-	};
-
-	if (!IsGroupMacro(macro.get())) {
-		updateMacro(macro.get());
-		return true;
-	}
-
-	auto macros = GetGroupMacroEntries(macro.get());
-	for (const auto &macro : macros) {
-		updateMacro(macro.get());
 	}
 	return true;
 }
@@ -149,7 +131,7 @@ void MacroActionTimer::ResolveVariablesToFixedValues()
 	_duration.ResolveVariables();
 }

-static void populateTypeSelection(QComboBox *list)
+static inline void populateTypeSelection(QComboBox *list)
 {
 	for (const auto &[_, name] : timerActions) {
 		list->addItem(obs_module_text(name.c_str()));
@@ -158,11 +140,12 @@ static void populateTypeSelection(QComboBox *list)

 MacroActionTimerEdit::MacroActionTimerEdit(
 	QWidget *parent, std::shared_ptr<MacroActionTimer> entryData)
-	: QWidget(parent),
-	  _macros(new MacroSelection(parent)),
-	  _duration(new DurationSelection(this)),
-	  _timerAction(new QComboBox(this))
+	: QWidget(parent)
 {
+	_macros = new MacroSelection(parent);
+	_duration = new DurationSelection();
+	_timerAction = new QComboBox();
+
 	populateTypeSelection(_timerAction);

 	QWidget::connect(_macros, SIGNAL(currentTextChanged(const QString &)),
@@ -172,13 +155,15 @@ MacroActionTimerEdit::MacroActionTimerEdit(
 	QWidget::connect(_timerAction, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(ActionTypeChanged(int)));

-	auto layout = new QHBoxLayout;
+	_mainLayout = new QHBoxLayout;
+	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
+		{"{{macros}}", _macros},
+		{"{{duration}}", _duration},
+		{"{{timerAction}}", _timerAction},
+	};
 	PlaceWidgets(obs_module_text("AdvSceneSwitcher.action.timer.entry"),
-		     layout,
-		     {{"{{macros}}", _macros},
-		      {"{{duration}}", _duration},
-		      {"{{timerAction}}", _timerAction}});
-	setLayout(layout);
+		     _mainLayout, widgetPlaceholders);
+	setLayout(_mainLayout);

 	_entryData = entryData;
 	UpdateEntryData();
--- a/plugins/base/macro-action-timer.hpp
+++ b/plugins/base/macro-action-timer.hpp
@@ -58,14 +58,16 @@ private slots:
 signals:
 	void HeaderInfoChanged(const QString &);

-private:
+protected:
 	void SetWidgetVisibility();

 	MacroSelection *_macros;
 	DurationSelection *_duration;
 	QComboBox *_timerAction;
-
 	std::shared_ptr<MacroActionTimer> _entryData;
+
+private:
+	QHBoxLayout *_mainLayout;
 	bool _loading = true;
 };

--- a/plugins/base/macro-condition-window.cpp
+++ b/plugins/base/macro-condition-window.cpp
@@ -29,22 +29,6 @@ static bool windowContainsText(const std::string &window,
 	return text == matchText;
 }

-void MacroConditionWindow::SetCheckText(bool value)
-{
-#ifdef _WIN32
-	_checkText = value;
-#else
-	(void)value;
-	_checkText = false;
-#endif
-	SetupTempVars();
-}
-
-bool MacroConditionWindow::GetCheckText()
-{
-	return _checkText;
-}
-
 bool MacroConditionWindow::WindowMatchesRequirements(
 	const std::string &window) const
 {
@@ -110,18 +94,12 @@ void MacroConditionWindow::SetVariableValueBasedOnMatch(
 #ifdef _WIN32
 	SetTempVarValue("windowClass",
 			GetWindowClassByWindowTitle(matchWindow));
-	if (_checkText) {
-		const auto text = GetTextInWindow(matchWindow);
-		if (text) {
-			SetTempVarValue("windowText", *text);
-		}
-	}
 #endif
 	if (!IsReferencedInVars()) {
 		return;
 	}
 	if (_checkText) {
-		const auto text = GetTextInWindow(matchWindow);
+		auto text = GetTextInWindow(matchWindow);
 		SetVariableValue(text.value_or(""));
 	} else {
 		SetVariableValue(ForegroundWindowTitle());
@@ -208,16 +186,6 @@ void MacroConditionWindow::SetupTempVars()
 		obs_module_text("AdvSceneSwitcher.tempVar.window.windowClass"),
 		obs_module_text(
 			"AdvSceneSwitcher.tempVar.window.windowClass.description"));
-
-	if (!_checkText) {
-		return;
-	}
-
-	AddTempvar(
-		"windowText",
-		obs_module_text("AdvSceneSwitcher.tempVar.window.windowText"),
-		obs_module_text(
-			"AdvSceneSwitcher.tempVar.window.windowText.description"));
 #endif
 }

@@ -381,7 +349,7 @@ void MacroConditionWindowEdit::CheckTitleChanged(int state)
 void MacroConditionWindowEdit::CheckTextChanged(int state)
 {
 	GUARD_LOADING_AND_LOCK();
-	_entryData->SetCheckText(state);
+	_entryData->_checkText = state;
 	SetWidgetVisibility();
 }

@@ -441,8 +409,8 @@ void MacroConditionWindowEdit::SetWidgetVisibility()
 			 _entryData->_focus || _entryData->_windowFocusChanged);
 	_windowSelection->setVisible(_entryData->_checkTitle);
 	_windowRegex->setVisible(_entryData->_checkTitle);
-	_textRegex->setVisible(_entryData->GetCheckText());
-	_text->setVisible(_entryData->GetCheckText());
+	_textRegex->setVisible(_entryData->_checkText);
+	_text->setVisible(_entryData->_checkText);
 	adjustSize();
 	updateGeometry();
 }
@@ -461,7 +429,7 @@ void MacroConditionWindowEdit::UpdateEntryData()
 	_maximized->setChecked(_entryData->_maximized);
 	_focused->setChecked(_entryData->_focus);
 	_windowFocusChanged->setChecked(_entryData->_windowFocusChanged);
-	_checkText->setChecked(_entryData->GetCheckText());
+	_checkText->setChecked(_entryData->_checkText);
 	_text->setPlainText(_entryData->_text);
 	_textRegex->SetRegexConfig(_entryData->_textRegex);
 	SetWidgetVisibility();
--- a/plugins/base/macro-condition-window.hpp
+++ b/plugins/base/macro-condition-window.hpp
@@ -22,9 +22,6 @@ public:
 		return std::make_shared<MacroConditionWindow>(m);
 	}

-	void SetCheckText(bool value);
-	bool GetCheckText();
-
 	StringVariable _window;
 	RegexConfig _windowRegex;
 	bool _checkTitle = true;
@@ -33,6 +30,8 @@ public:
 	bool _focus = true;
 	bool _windowFocusChanged = false;

+	// For now only supported on Windows
+	bool _checkText = false;
 	StringVariable _text;
 	RegexConfig _textRegex = RegexConfig::PartialMatchRegexConfig();

@@ -43,9 +42,6 @@ private:
 	void SetVariableValueBasedOnMatch(const std::string &matchWindow);
 	void SetupTempVars();

-	// For now only supported on Windows
-	bool _checkText = false;
-
 	static bool _registered;
 	static const std::string id;
 };
--- a/plugins/base/utils/hotkey-helpers.hpp
+++ b/plugins/base/utils/hotkey-helpers.hpp
@@ -10,7 +10,7 @@ namespace advss {
 enum class HotkeyType;

 bool CanSimulateKeyPresses();
-void PressKeys(const std::vector<HotkeyType> &keys, int duration);
+void PressKeys(const std::vector<HotkeyType> keys, int duration);

 class Hotkey {
 public:
--- a/plugins/base/utils/linux/linux.cpp
+++ b/plugins/base/utils/linux/linux.cpp
@@ -188,7 +188,7 @@ static const std::unordered_map<HotkeyType, long> keyTable = {
 	{HotkeyType::Key_NumpadEnter, XK_KP_Enter},
 };

-void PressKeys(const std::vector<HotkeyType> &keys, int duration)
+void PressKeys(const std::vector<HotkeyType> keys, int duration)
 {
 	if (!canSimulateKeyPresses) {
 		return;
--- a/plugins/base/utils/osx/osx.mm
+++ b/plugins/base/utils/osx/osx.mm
@@ -9,7 +9,7 @@ bool CanSimulateKeyPresses()
 	return canSimulateKeyPresses;
 }

-void PressKeys(const std::vector<HotkeyType> &, int)
+void PressKeys(const std::vector<HotkeyType> keys, int duration)
 {
 	// Not supported on MacOS
 	return;
--- a/plugins/base/utils/source-setting.cpp
+++ b/plugins/base/utils/source-setting.cpp
@@ -210,7 +210,7 @@ findListPropertyById(const obs_source_t *source, const std::string &id)
 	}
 	auto property = obs_properties_first(properties);
 	return {findListPropertyByIdHelper(property, id),
-		properties_t(properties, obs_properties_destroy)};
+		properties_t(nullptr, obs_properties_destroy)};
 }

 static std::pair<obs_property_t *, properties_t>
--- a/plugins/base/utils/windows/windows.cpp
+++ b/plugins/base/utils/windows/windows.cpp
@@ -138,7 +138,7 @@ static const std::unordered_map<HotkeyType, long> keyTable = {
 	{HotkeyType::Key_NumpadEnter, VK_RETURN},
 };

-void PressKeys(const std::vector<HotkeyType> &keys, int duration)
+void PressKeys(const std::vector<HotkeyType> keys, int duration)
 {
 	const int repeatInterval = 100;

--- a/plugins/scripting/macro-script-handler.cpp
+++ b/plugins/scripting/macro-script-handler.cpp
@@ -513,7 +513,7 @@ void ScriptHandler::SetVariableValue(void *, calldata_t *data)
 	RETURN_SUCCESS();
 }

-void ScriptHandler::GetRunningStatus(void *, calldata_t *data)
+void ScriptHandler::GetRunningStatus(void *ctx, calldata_t *data)
 {
 	calldata_set_bool(data, "is_running", PluginIsRunning());
 }
--- a/plugins/twitch/channel-selection.cpp
+++ b/plugins/twitch/channel-selection.cpp
@@ -58,16 +58,14 @@ std::string TwitchChannel::GetUserID(const TwitchToken &token) const
 	}
 	OBSDataArrayAutoRelease array = obs_data_get_array(res.data, "data");
 	size_t count = obs_data_array_count(array);
-
-	if (count == 0) {
-		userIDCache[_name] = "invalid";
-		return "invalid";
+	for (size_t i = 0; i < count; i++) {
+		OBSDataAutoRelease arrayObj = obs_data_array_item(array, i);
+		std::string id = obs_data_get_string(arrayObj, "id");
+		userIDCache[_name] = id;
+		return id;
 	}
-
-	OBSDataAutoRelease arrayObj = obs_data_array_item(array, 0);
-	const std::string id = obs_data_get_string(arrayObj, "id");
-	userIDCache[_name] = id;
-	return id;
+	userIDCache[_name] = "invalid";
+	return "invalid";
 }

 static QDate parseRFC3339Date(const std::string &rfc3339Date)
--- a/plugins/twitch/event-sub.cpp
+++ b/plugins/twitch/event-sub.cpp
@@ -72,6 +72,7 @@ void EventSub::UnregisterInstance()
 void EventSub::ConnectThread()
 {
 	_client->reset();
+	_connected = true;
 	websocketpp::lib::error_code ec;
 	EventSubWSClient::connection_ptr con =
 		_client->get_connection(_url, ec);
@@ -112,7 +113,6 @@ void EventSub::Connect()
 		_thread.join();
 	}
 	_disconnect = false;
-	_connected = true;
 	_thread = std::thread(&EventSub::ConnectThread, this);
 }

@@ -448,7 +448,7 @@ void EventSub::StartServerMigrationClient(const std::string &url)
 	auto client = std::make_unique<EventSubWSClient>();
 	SetupClient(*client);

-	client->set_open_handler([this](connection_hdl) {
+	client->set_open_handler([this](connection_hdl hdl) {
 		vblog(LOG_INFO, "Twitch EventSub migration client opened");
 	});

--- a/plugins/twitch/macro-action-twitch.cpp
+++ b/plugins/twitch/macro-action-twitch.cpp
@@ -83,8 +83,6 @@ const static std::map<MacroActionTwitch::Action, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.twitch.type.user.getInfo"},
 	{MacroActionTwitch::Action::POINTS_REWARD_GET_INFO,
 	 "AdvSceneSwitcher.action.twitch.type.reward.getInfo"},
-	{MacroActionTwitch::Action::CHANNEL_GET_INFO,
-	 "AdvSceneSwitcher.action.twitch.type.channel.getInfo"},
 };

 const static std::map<MacroActionTwitch::AnnouncementColor, std::string>
@@ -324,41 +322,6 @@ void MacroActionTwitch::GetUserInfo(const std::shared_ptr<TwitchToken> &token)
 	});
 }

-void MacroActionTwitch::GetChannelInfo(const std::shared_ptr<TwitchToken> &token)
-{
-	auto info = _channel.GetInfo(*token);
-	if (!info) {
-		return;
-	}
-
-	SetTempVarValue("broadcaster_user_id", info->broadcaster_id);
-	SetTempVarValue("broadcaster_user_login", info->broadcaster_login);
-	SetTempVarValue("broadcaster_user_name", info->broadcaster_name);
-	SetTempVarValue("language", info->broadcaster_language);
-	SetTempVarValue("game_id", info->game_id);
-	SetTempVarValue("game_name", info->game_name);
-	SetTempVarValue("title", info->title);
-	SetTempVarValue("delay", std::to_string(info->delay));
-	std::string tags;
-	for (const auto &tag : info->tags) {
-		tags += tag + " ";
-	}
-	if (!tags.empty()) {
-		tags.pop_back();
-	}
-	SetTempVarValue("tags", tags);
-	std::string classificationLabels;
-	for (const auto &label : info->content_classification_labels) {
-		classificationLabels += label + " ";
-	}
-	if (!classificationLabels.empty()) {
-		classificationLabels.pop_back();
-	}
-	SetTempVarValue("content_classification_labels", classificationLabels);
-	SetTempVarValue("is_branded_content",
-			info->is_branded_content ? "true" : "false");
-}
-
 bool MacroActionTwitch::ResolveVariableSelectionToRewardId(
 	const std::shared_ptr<TwitchToken> &token)
 {
@@ -542,16 +505,6 @@ void MacroActionTwitch::SetupTempVars()
 		setupTempVarHelper("offline_image_url", ".user.getInfo");
 		setupTempVarHelper("created_at", ".user.getInfo");
 		break;
-	case Action::CHANNEL_GET_INFO:
-		setupTempVarHelper("language");
-		setupTempVarHelper("game_id");
-		setupTempVarHelper("game_name");
-		setupTempVarHelper("title");
-		setupTempVarHelper("delay");
-		setupTempVarHelper("tags");
-		setupTempVarHelper("content_classification_labels");
-		setupTempVarHelper("is_branded_content");
-		break;
 	default:
 		break;
 	}
@@ -610,9 +563,6 @@ bool MacroActionTwitch::PerformAction()
 	case MacroActionTwitch::Action::POINTS_REWARD_GET_INFO:
 		GetRewardInfo(token);
 		break;
-	case MacroActionTwitch::Action::CHANNEL_GET_INFO:
-		GetChannelInfo(token);
-		break;
 	default:
 		break;
 	}
@@ -822,7 +772,6 @@ bool MacroActionTwitch::ActionIsSupportedByToken()
 			{Action::WHISPER_SEND, {{"user:manage:whispers"}}},
 			{Action::SEND_CHAT_MESSAGE, {{"chat:edit"}}},
 			{Action::USER_GET_INFO, {}},
-			{Action::CHANNEL_GET_INFO, {}},
 			{Action::POINTS_REWARD_GET_INFO,
 			 {{"channel:read:redemptions"},
 			  {"channel:manage:redemptions"}}}};
@@ -1178,8 +1127,6 @@ void MacroActionTwitchEdit::SetWidgetVisibility()
 		_entryData->GetAction() ==
 		MacroActionTwitch::Action::CHANNEL_INFO_CONTENT_LABELS_SET);
 	_channel->setVisible(
-		_entryData->GetAction() ==
-			MacroActionTwitch::Action::CHANNEL_GET_INFO ||
 		_entryData->GetAction() ==
 			MacroActionTwitch::Action::RAID_START ||
 		_entryData->GetAction() ==
@@ -1326,23 +1273,19 @@ void MacroActionTwitchEdit::SetWidgetLayout()
 	switch (_entryData->GetAction()) {
 	case MacroActionTwitch::Action::SEND_CHAT_MESSAGE:
 		layoutText = obs_module_text(
-			"AdvSceneSwitcher.action.twitch.layout.chat");
+			"AdvSceneSwitcher.action.twitch.entry.chat");
 		break;
 	case MacroActionTwitch::Action::USER_GET_INFO:
 		layoutText = obs_module_text(
-			"AdvSceneSwitcher.action.twitch.layout.user.getInfo");
+			"AdvSceneSwitcher.action.twitch.entry.user.getInfo");
 		break;
 	case MacroActionTwitch::Action::POINTS_REWARD_GET_INFO:
 		layoutText = obs_module_text(
-			"AdvSceneSwitcher.action.twitch.layout.reward.getInfo");
-		break;
-	case MacroActionTwitch::Action::CHANNEL_GET_INFO:
-		layoutText = obs_module_text(
-			"AdvSceneSwitcher.action.twitch.layout.channel.getInfo");
+			"AdvSceneSwitcher.action.twitch.entry.reward.getInfo");
 		break;
 	default:
 		layoutText = obs_module_text(
-			"AdvSceneSwitcher.action.twitch.layout.default");
+			"AdvSceneSwitcher.action.twitch.entry.default");
 		break;
 	}

--- a/plugins/twitch/macro-action-twitch.hpp
+++ b/plugins/twitch/macro-action-twitch.hpp
@@ -142,8 +142,7 @@ public:
 		SEND_CHAT_MESSAGE = 5000,

 		// Get user info
-		USER_GET_INFO = 6000,
-		CHANNEL_GET_INFO = 6100,
+		USER_GET_INFO = 6000
 	};

 	enum class AnnouncementColor {
@@ -204,7 +203,6 @@ private:
 	void SendChatMessage(const std::shared_ptr<TwitchToken> &);
 	void GetUserInfo(const std::shared_ptr<TwitchToken> &);
 	void GetRewardInfo(const std::shared_ptr<TwitchToken> &);
-	void GetChannelInfo(const std::shared_ptr<TwitchToken> &token);

 	bool ResolveVariableSelectionToRewardId(
 		const std::shared_ptr<TwitchToken> &);
--- a/plugins/twitch/macro-condition-twitch.cpp
+++ b/plugins/twitch/macro-condition-twitch.cpp
@@ -629,7 +629,7 @@ void MacroConditionTwitch::SetTempVarValues(const ChannelInfo &info)
 	if (!classificationLabels.empty()) {
 		classificationLabels.pop_back();
 	}
-	SetTempVarValue("content_classification_labels", classificationLabels);
+	SetTempVarValue("content_classification_labels", tags);
 	SetTempVarValue("is_branded_content",
 			info.is_branded_content ? "true" : "false");
 }
--- a/plugins/twitch/token.cpp
+++ b/plugins/twitch/token.cpp
@@ -829,7 +829,7 @@ void TokenGrabberThread::run()
 	if (_serverThread.joinable()) {
 		_serverThread.join();
 	}
-	_stopWaiting = false;
+	_stopWaiting = {false};

 	// Generate URI to request token
 	auto state = generateStateString();
Author	SHA1	Message	Date
WarmUpTill	5a69e774c2	Fix warnings	2025-12-11 18:43:49 +01:00
WarmUpTill	2389f37ed6	Add temp var for last recording save path	2025-12-11 17:22:37 +01:00