Fix warnings

Add temp var for last recording save path
Rearrange layout of "General" tab
2026-08-29 20:55:28 -05:00 · 2025-12-11 18:43:49 +01:00 · 2025-12-11 17:22:37 +01:00 · 2025-12-06 19:27:54 +01:00 · 2025-12-06 19:27:54 +01:00 · 2025-12-06 19:27:54 +01:00
55 changed files with 1621 additions and 648 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,6 +146,8 @@ target_sources(
          lib/macro/macro-ref.hpp
          lib/macro/macro-run-button.cpp
          lib/macro/macro-run-button.hpp
          lib/macro/macro-search.cpp
          lib/macro/macro-search.hpp
          lib/macro/macro-segment-copy-paste.cpp
          lib/macro/macro-segment-copy-paste.hpp
          lib/macro/macro-segment-list.cpp
--- a/cmake/common/buildspec_common.cmake
+++ b/cmake/common/buildspec_common.cmake
@@ -180,24 +180,46 @@ function(_check_dependencies)
      set(url ${url}/${version}/${file})
    endif()
    set(MAX_DOWNLOAD_RETRIES 3)
    set(RETRY_DELAY 60) # seconds
    if(NOT EXISTS "${dependencies_dir}/${file}")
      message(STATUS "Downloading ${url}")
      file(
        DOWNLOAD "${url}" "${dependencies_dir}/${file}"
        STATUS download_status
        EXPECTED_HASH SHA256=${hash})
-      list(GET download_status 0 error_code)
+      set(download_success FALSE)
-      list(GET download_status 1 error_message)
+
-      if(error_code GREATER 0)
+      foreach(i RANGE 1 ${MAX_DOWNLOAD_RETRIES})
-        message(STATUS "Downloading ${url} - Failure")
+        message(STATUS "Attempt ${i}/${MAX_DOWNLOAD_RETRIES} for ${url}")
        file(
          DOWNLOAD "${url}" "${dependencies_dir}/${file}"
          STATUS download_status
          EXPECTED_HASH SHA256=${hash})
        list(GET download_status 0 error_code)
        list(GET download_status 1 error_message)
        if(error_code EQUAL 0)
          message(STATUS "Downloading ${url} - success on attempt ${i}")
          set(download_success TRUE)
          break()
        else()
          message(WARNING "Download failed (attempt ${i}): ${error_message}")
          file(REMOVE "${dependencies_dir}/${file}")
          if(NOT i EQUAL MAX_DOWNLOAD_RETRIES)
            message(STATUS "Retrying in ${RETRY_DELAY} seconds...")
            execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${RETRY_DELAY})
          endif()
        endif()
      endforeach()
      if(NOT download_success)
        message(
          FATAL_ERROR
-            "Unable to download ${url}, failed with error: ${error_message}")
+            "Unable to download ${url} after ${MAX_DOWNLOAD_RETRIES} attempts")
        file(REMOVE "${dependencies_dir}/${file}")
      else()
        message(STATUS "Downloading ${url} - done")
      endif()
      message(STATUS "Downloading ${url} - done")
    endif()
    if(NOT EXISTS "${dependencies_dir}/${destination}")
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -43,7 +43,7 @@ AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure="Display warni
 AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage="<html><body>Loading of the following plugin libraries was unsuccessful, which could result in some Advanced Scene Switcher functions not being available:%1Check the OBS logs for details.<br>This message can be disabled on the General tab.</body></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.disableMacroWidgetCache="Disable macro widget caching"
+AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch="Always show macro search"
 AdvSceneSwitcher.generalTab.matchBehavior="Match behavior"
 AdvSceneSwitcher.generalTab.priority="Priority"
 AdvSceneSwitcher.generalTab.priority.description="Switching methods priority (Highest priority is at the top)"
@@ -74,6 +74,7 @@ AdvSceneSwitcher.generalTab.setTransitionBy="When changing transitions:"
 AdvSceneSwitcher.generalTab.transitionOverride="Set transition overrides"
 AdvSceneSwitcher.generalTab.adjustActiveTransitionType="Change active transition type"
 AdvSceneSwitcher.generalTab.transitionBehaviorSelectionError="At least one option must be enabled:\n\n - Use transition overrides\n\n - Change active transition type"
 AdvSceneSwitcher.generalTab.uiBehavior="UI settings"
 # Variables Tab
 AdvSceneSwitcher.variableTab.title="Variables"
@@ -91,6 +92,12 @@ AdvSceneSwitcher.variableTab.lastUsed.text.never="Never"
 AdvSceneSwitcher.variableTab.lastChanged.header="Last changed"
 AdvSceneSwitcher.variableTab.lastChanged.text.none="No change since launch"
 AdvSceneSwitcher.variableTab.lastChanged.tooltip="Times changed: %1\n\nPrevious value: %2"
 AdvSceneSwitcher.variableTab.search.placeholder="Search ..."
 AdvSceneSwitcher.variableTab.search.all="All columns"
 AdvSceneSwitcher.variableTab.search.name="Name column"
 AdvSceneSwitcher.variableTab.search.value="Value column"
 AdvSceneSwitcher.variableTab.addDock="Add dock"
 AdvSceneSwitcher.variableTab.clear="Clear"
 # Action Queue Tab
 AdvSceneSwitcher.actionQueueTab.title="Action Queues"
@@ -270,6 +277,13 @@ AdvSceneSwitcher.macroTab.tooltip.elseActionUpButton="Move selected action up in
 AdvSceneSwitcher.macroTab.tooltip.elseActionDownButton="Move selected action down in the else section"
 AdvSceneSwitcher.macroTab.tooltip.elseActionBottomButton="Move selected action to the bottom in the else section"
 AdvSceneSwitcher.macroTab.tooltip.openMacroSettingsButton="Open macro settings"
 AdvSceneSwitcher.macroTab.search.placeholder="Search ..."
 AdvSceneSwitcher.macroTab.search.showSettings="Show search settings"
 AdvSceneSwitcher.macroTab.search.name="Name"
 AdvSceneSwitcher.macroTab.search.allSegments="Segment type"
 AdvSceneSwitcher.macroTab.search.conditions="Condition type"
 AdvSceneSwitcher.macroTab.search.actions="Action type"
 AdvSceneSwitcher.macroTab.search.label="Segment label"
 AdvSceneSwitcher.macroDock.pause="Pause"
 AdvSceneSwitcher.macroDock.unpause="Unpause"
@@ -928,6 +942,9 @@ AdvSceneSwitcher.action.source.type.deinterlaceOrder="Set deinterlace field orde
 AdvSceneSwitcher.action.source.type.openInteractionDialog="Open interaction dialog"
 AdvSceneSwitcher.action.source.type.openFilterDialog="Open filter dialog"
 AdvSceneSwitcher.action.source.type.openPropertiesDialog="Open properties dialog"
 AdvSceneSwitcher.action.source.type.closeInteractionDialog="Close interaction dialog"
 AdvSceneSwitcher.action.source.type.closeFilterDialog="Close filter dialog"
 AdvSceneSwitcher.action.source.type.closePropertiesDialog="Close properties dialog"
 AdvSceneSwitcher.action.source.entry="{{actions}}{{sources}}{{settingsButtons}}{{deinterlaceMode}}{{deinterlaceOrder}}{{refresh}}"
 AdvSceneSwitcher.action.source.entry.settings="{{settings}}{{settingsInputMethod}}{{settingValue}}{{tempVar}}"
 AdvSceneSwitcher.action.source.warning="Warning: Enabling and disabling sources globally cannot be controlled by the OBS UI\nYou might be looking for \"Scene item visibility\""
@@ -949,6 +966,7 @@ AdvSceneSwitcher.action.source.inputMethod.individualTempvar="Set to macro prope
 AdvSceneSwitcher.action.source.inputMethod.json="Set setting JSON string"
 AdvSceneSwitcher.action.source.refresh="Refresh"
 AdvSceneSwitcher.action.source.refresh.tooltip="Repopulate the source settings selection with the settings of the source which's name matches the variable value."
 AdvSceneSwitcher.action.source.dialog.accept="Accept changes"
 AdvSceneSwitcher.action.media="Media"
 AdvSceneSwitcher.action.media.type.play="Play"
 AdvSceneSwitcher.action.media.type.pause="Pause"
@@ -1145,6 +1163,7 @@ AdvSceneSwitcher.action.http.entry.line2="Timeout:{{timeout}}seconds"
 AdvSceneSwitcher.action.variable="Variable"
 AdvSceneSwitcher.action.variable.type.set="Set to value"
 AdvSceneSwitcher.action.variable.type.append="Append"
 AdvSceneSwitcher.action.variable.type.copy="Copy variable"
 AdvSceneSwitcher.action.variable.type.appendVar="Append variable"
 AdvSceneSwitcher.action.variable.type.increment="Increment"
 AdvSceneSwitcher.action.variable.type.decrement="Decrement"
@@ -1596,7 +1615,11 @@ AdvSceneSwitcher.twitchToken.moderator.chat.settings.manage="Manage channel's ch
 AdvSceneSwitcher.twitchToken.user.whispers.manage="Manage user's whispers."
 AdvSceneSwitcher.twitchToken.chat.read="View live stream chat messages."
 AdvSceneSwitcher.twitchToken.chat.edit="Send live stream chat messages."
-AdvSceneSwitcher.twitchToken.validateTimestamps="Validate timestamps of received Twitch event messages. (Recommended)"
+AdvSceneSwitcher.twitchToken.validateTimestamps="Validate timestamps of received Twitch event messages."
 AdvSceneSwitcher.twitchToken.validateTimestamps.tooltip="Verifies that incoming Twitch messages have valid timestamps to prevent replayed or spoofed messages.\nDisabling this won’t affect normal functionality, and you can try turning it off if you experience issues with the Twitch connection."
 AdvSceneSwitcher.twitchToken.warnIfInvalid="Display warning if the token expired or is invalid."
 AdvSceneSwitcher.twitchToken.warnIfInvalid.doNotShowAgain="Don't show again for this connection"
 AdvSceneSwitcher.twitchToken.warnIfInvalid.message="The Twitch connection \"%1\" is invalid.\nOpen connection settings or ignore?"
 AdvSceneSwitcher.twitch.selection.channel.open="Open channel"
 AdvSceneSwitcher.twitch.selection.channel.open.tooltip.details="Open channel in external application handling the HTTPS protocol."
@@ -2163,6 +2186,8 @@ AdvSceneSwitcher.tempVar.run.process.none.description="When not waiting for the
 AdvSceneSwitcher.tempVar.recording.durationSeconds="Recording duration"
 AdvSceneSwitcher.tempVar.recording.durationSeconds.description="Recording duration in seconds.\nThis value does not change while the recording is paused and will be reset to zero if the recording is stopped."
 AdvSceneSwitcher.tempVar.recording.lastSavePath="Last save path"
 AdvSceneSwitcher.tempVar.recording.lastSavePath.description="The file path of the last saved recording."
 AdvSceneSwitcher.tempVar.video.patternCount="Pattern count"
 AdvSceneSwitcher.tempVar.video.patternCount.description="The number of times the given pattern has been found in a given video input frame."
@@ -2312,6 +2337,9 @@ AdvSceneSwitcher.tempVar.mqtt.message="Message"
 AdvSceneSwitcher.tempVar.cursor.x="Cursor position (X)"
 AdvSceneSwitcher.tempVar.cursor.y="Cursor position (Y)"
 AdvSceneSwitcher.tempVar.replay.lastSavePath="Last save path"
 AdvSceneSwitcher.tempVar.replay.lastSavePath.description="The file path of the last replay buffer saved."
 AdvSceneSwitcher.selectScene="--select scene--"
 AdvSceneSwitcher.selectCanvas="--select canvas--"
 AdvSceneSwitcher.selectPreviousScene="Previous Scene"
--- a/data/locale/ja-JP.ini
+++ b/data/locale/ja-JP.ini
@@ -42,7 +42,6 @@ AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure="プラグイ
 AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage="<html><body>次のプラグイン ライブラリの読み込みに失敗したため、一部の高機能シーンスイッチャーが利用できなくなる可能性があります:%1詳細については、OBS ログを確認してください。<br>このメッセージは、[全般] タブで無効にすることができます。 </body></html>"
 AdvSceneSwitcher.generalTab.generalBehavior.warnCorruptedInstallMessage="プラグインが正しくインストールできておらずクラッシュする可能性があります！\nプラグインが正しくインストールされているか確認してください！"
 AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs="旧来型マクロ設定のタブを非表示にする（廃止予定タブ）"
 AdvSceneSwitcher.generalTab.generalBehavior.disableMacroWidgetCache="マクロウィジェットのキャッシングを無効にする"
 AdvSceneSwitcher.generalTab.matchBehavior="マッチした場合の動作（廃止予定の設定項目）"
 AdvSceneSwitcher.generalTab.priority="優先順位"
 AdvSceneSwitcher.generalTab.priority.description="切り替え方法の優先順位（優先順位が高いものが上）"
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -68,365 +68,162 @@
            <x>0</x>
            <y>0</y>
            <width>962</width>
-            <height>1057</height>
+            <height>1132</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_19">
           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_31">
+            <widget class="QGroupBox" name="statusBox">
-             <item>
+             <property name="title">
-              <layout class="QVBoxLayout" name="verticalLayout_2">
+              <string>AdvSceneSwitcher.generalTab.status</string>
-               <item>
+             </property>
-                <widget class="QGroupBox" name="statusBox">
+             <layout class="QGridLayout" name="gridLayout_4">
-                 <property name="title">
+              <item row="0" column="0">
-                  <string>AdvSceneSwitcher.generalTab.status</string>
+               <layout class="QGridLayout" name="statusLayout">
-                 </property>
+                <item row="4" column="1">
-                 <layout class="QGridLayout" name="gridLayout_4">
+                 <widget class="QComboBox" name="autoStartEvent"/>
-                  <item row="0" column="0">
+                </item>
-                   <layout class="QGridLayout" name="statusLayout">
+                <item row="4" column="0">
-                    <item row="4" column="1">
+                 <widget class="QLabel" name="label_10">
-                     <widget class="QComboBox" name="autoStartEvent"/>
+                  <property name="text">
-                    </item>
+                   <string>AdvSceneSwitcher.generalTab.status.autoStart.startup</string>
-                    <item row="4" column="0">
+                  </property>
-                     <widget class="QLabel" name="label_10">
+                 </widget>
-                      <property name="text">
+                </item>
-                       <string>AdvSceneSwitcher.generalTab.status.autoStart.startup</string>
+                <item row="0" column="0">
-                      </property>
+                 <layout class="QVBoxLayout" name="verticalLayout_33">
-                     </widget>
+                  <item>
-                    </item>
+                   <widget class="QLabel" name="label_4">
-                    <item row="0" column="0">
+                    <property name="text">
-                     <layout class="QVBoxLayout" name="verticalLayout_33">
+                     <string>AdvSceneSwitcher.generalTab.status.checkInterval</string>
-                      <item>
+                    </property>
-                       <widget class="QLabel" name="label_4">
+                   </widget>
-                        <property name="text">
+                  </item>
-                         <string>AdvSceneSwitcher.generalTab.status.checkInterval</string>
+                  <item>
-                        </property>
+                   <widget class="QLabel" name="checkIntervalTooLowWarning">
-                       </widget>
+                    <property name="text">
-                      </item>
+                     <string/>
-                      <item>
+                    </property>
-                       <widget class="QLabel" name="checkIntervalTooLowWarning">
+                   </widget>
                        <property name="text">
                         <string/>
                        </property>
                       </widget>
                      </item>
                     </layout>
                    </item>
                    <item row="3" column="1">
                     <widget class="QComboBox" name="startupBehavior"/>
                    </item>
                    <item row="1" column="1">
                     <widget class="QWidget" name="placeholder3" native="true"/>
                    </item>
                    <item row="1" column="0">
                     <widget class="QWidget" name="placeholder" native="true"/>
                    </item>
                    <item row="3" column="0">
                     <widget class="QLabel" name="label_64">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.status.onStartup</string>
                      </property>
                     </widget>
                    </item>
                    <item row="2" column="1">
                     <widget class="QWidget" name="placeholder2" native="true"/>
                    </item>
                    <item row="6" column="0">
                     <widget class="QLabel" name="label_13">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.status.hotkeytips</string>
                      </property>
                     </widget>
                    </item>
                    <item row="0" column="1">
                     <widget class="QSpinBox" name="checkInterval">
                      <property name="minimumSize">
                       <size>
                        <width>100</width>
                        <height>0</height>
                       </size>
                      </property>
                      <property name="suffix">
                       <string notr="true">ms</string>
                      </property>
                      <property name="minimum">
                       <number>10</number>
                      </property>
                      <property name="maximum">
                       <number>20000</number>
                      </property>
                      <property name="value">
                       <number>300</number>
                      </property>
                     </widget>
                    </item>
                    <item row="5" column="0">
                     <widget class="QCheckBox" name="autoStartSceneEnable">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.status.autoStart.scene</string>
                      </property>
                     </widget>
                    </item>
                    <item row="5" column="1">
                     <layout class="QHBoxLayout" name="autoStartSceneLayout">
                      <item>
                       <widget class="advss::SceneSelectionWidget" name="autoStartScene" native="true"/>
                      </item>
                      <item>
                       <widget class="advss::VariableLineEdit" name="autoStartSceneName"/>
                      </item>
                      <item>
                       <widget class="advss::RegexConfigWidget" name="autoStartSceneNameRegex" native="true"/>
                      </item>
                     </layout>
                    </item>
                   </layout>
                  </item>
                 </layout>
-                </widget>
+                </item>
-               </item>
+                <item row="3" column="1">
-               <item>
+                 <widget class="QComboBox" name="startupBehavior"/>
-                <widget class="QGroupBox" name="generalSettingsBox">
+                </item>
-                 <property name="title">
+                <item row="1" column="1">
-                  <string>AdvSceneSwitcher.generalTab.generalBehavior</string>
+                 <widget class="QWidget" name="placeholder3" native="true"/>
-                 </property>
+                </item>
-                 <layout class="QVBoxLayout" name="verticalLayout_32">
+                <item row="1" column="0">
                 <widget class="QWidget" name="placeholder" native="true"/>
                </item>
                <item row="3" column="0">
                 <widget class="QLabel" name="label_64">
                  <property name="text">
                   <string>AdvSceneSwitcher.generalTab.status.onStartup</string>
                  </property>
                 </widget>
                </item>
                <item row="2" column="1">
                 <widget class="QWidget" name="placeholder2" native="true"/>
                </item>
                <item row="6" column="0">
                 <widget class="QLabel" name="label_13">
                  <property name="text">
                   <string>AdvSceneSwitcher.generalTab.status.hotkeytips</string>
                  </property>
                 </widget>
                </item>
                <item row="0" column="1">
                 <widget class="QSpinBox" name="checkInterval">
                  <property name="minimumSize">
                   <size>
                    <width>100</width>
                    <height>0</height>
                   </size>
                  </property>
                  <property name="suffix">
                   <string notr="true">ms</string>
                  </property>
                  <property name="minimum">
                   <number>10</number>
                  </property>
                  <property name="maximum">
                   <number>20000</number>
                  </property>
                  <property name="value">
                   <number>300</number>
                  </property>
                 </widget>
                </item>
                <item row="5" column="0">
                 <widget class="QCheckBox" name="autoStartSceneEnable">
                  <property name="text">
                   <string>AdvSceneSwitcher.generalTab.status.autoStart.scene</string>
                  </property>
                 </widget>
                </item>
                <item row="5" column="1">
                 <layout class="QHBoxLayout" name="autoStartSceneLayout">
                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_52">
+                   <widget class="advss::SceneSelectionWidget" name="autoStartScene" native="true"/>
                    <item>
                     <widget class="QLabel" name="label_21">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.generalBehavior.logLevel</string>
                      </property>
                     </widget>
                    </item>
                    <item>
                     <widget class="QComboBox" name="logLevel"/>
                    </item>
                    <item>
                     <spacer name="horizontalSpacer_49">
                      <property name="orientation">
                       <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
                        <width>40</width>
                        <height>20</height>
                       </size>
                      </property>
                     </spacer>
                    </item>
                   </layout>
                  </item>
                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_50">
+                   <widget class="advss::VariableLineEdit" name="autoStartSceneName"/>
                    <item>
                     <widget class="QCheckBox" name="saveWindowGeo">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo</string>
                      </property>
                     </widget>
                    </item>
                    <item>
                     <spacer name="horizontalSpacer_55">
                      <property name="orientation">
                       <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
                        <width>40</width>
                        <height>20</height>
                       </size>
                      </property>
                     </spacer>
                    </item>
                   </layout>
                  </item>
                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_2">
+                   <widget class="advss::RegexConfigWidget" name="autoStartSceneNameRegex" native="true"/>
                    <item>
                     <widget class="QCheckBox" name="showTrayNotifications">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications</string>
                      </property>
                     </widget>
                    </item>
                    <item>
                     <spacer name="horizontalSpacer_2">
                      <property name="orientation">
                       <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
                        <width>40</width>
                        <height>20</height>
                       </size>
                      </property>
                     </spacer>
                    </item>
                   </layout>
                  </item>
                  <item>
                   <layout class="QHBoxLayout" name="horizontalLayout_48">
                    <item>
                     <widget class="QCheckBox" name="uiHintsDisable">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints</string>
                      </property>
                     </widget>
                    </item>
                    <item>
                     <spacer name="horizontalSpacer_52">
                      <property name="orientation">
                       <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
                        <width>40</width>
                        <height>20</height>
                       </size>
                      </property>
                     </spacer>
                    </item>
                   </layout>
                  </item>
                  <item>
                   <layout class="QHBoxLayout" name="horizontalLayout_11">
                    <item>
                     <widget class="QCheckBox" name="disableComboBoxFilter">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.generalBehavior.comboBoxFilterDisable</string>
                      </property>
                     </widget>
                    </item>
                    <item>
                     <spacer name="horizontalSpacer_13">
                      <property name="orientation">
                       <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
                        <width>40</width>
                        <height>20</height>
                       </size>
                      </property>
                     </spacer>
                    </item>
                   </layout>
                  </item>
                  <item>
                   <layout class="QHBoxLayout" name="horizontalLayout_12">
                    <item>
                     <widget class="QCheckBox" name="disableMacroWidgetCache">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.generalBehavior.disableMacroWidgetCache</string>
                      </property>
                     </widget>
                    </item>
                   </layout>
                  </item>
                  <item>
                   <layout class="QHBoxLayout" name="horizontalLayout_26">
                    <item>
                     <widget class="QCheckBox" name="warnPluginLoadFailure">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure</string>
                      </property>
                     </widget>
                    </item>
                    <item>
                     <spacer name="horizontalSpacer_19">
                      <property name="orientation">
                       <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
                        <width>40</width>
                        <height>20</height>
                       </size>
                      </property>
                     </spacer>
                    </item>
                   </layout>
                  </item>
                  <item>
                   <layout class="QHBoxLayout" name="horizontalLayout_24">
                    <item>
                     <widget class="QCheckBox" name="hideLegacyTabs">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs</string>
                      </property>
                     </widget>
                    </item>
                    <item>
                     <spacer name="horizontalSpacer_16">
                      <property name="orientation">
                       <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
                        <width>40</width>
                        <height>20</height>
                       </size>
                      </property>
                     </spacer>
                    </item>
                   </layout>
                  </item>
                 </layout>
-                </widget>
+                </item>
-               </item>
+               </layout>
-               <item>
+              </item>
-                <layout class="QVBoxLayout" name="verticalLayout_18">
+             </layout>
-                 <item>
+            </widget>
                  <widget class="QGroupBox" name="saveLoadBox">
                   <property name="title">
                    <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings</string>
                   </property>
                   <layout class="QVBoxLayout" name="verticalLayout_17">
                    <item>
                     <widget class="QPushButton" name="exportSettings">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.export</string>
                      </property>
                     </widget>
                    </item>
                    <item>
                     <widget class="QPushButton" name="importSettings">
                      <property name="text">
                       <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.import</string>
                      </property>
                     </widget>
                    </item>
                   </layout>
                  </widget>
                 </item>
                </layout>
               </item>
              </layout>
             </item>
            </layout>
           </item>
           <item>
-            <widget class="QGroupBox" name="groupBox_6">
+            <widget class="QGroupBox" name="saveLoadBox">
             <property name="title">
-              <string>AdvSceneSwitcher.generalTab.matchBehavior</string>
+              <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings</string>
             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_37">
+             <layout class="QVBoxLayout" name="verticalLayout_17">
              <item>
-               <layout class="QHBoxLayout" name="cooldownLayout">
+               <widget class="QPushButton" name="exportSettings">
                <property name="text">
                 <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.export</string>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QPushButton" name="importSettings">
                <property name="text">
                 <string>AdvSceneSwitcher.generalTab.saveOrLoadsettings.import</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <widget class="QGroupBox" name="generalSettingsBox">
             <property name="title">
              <string>AdvSceneSwitcher.generalTab.generalBehavior</string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_32">
              <item>
               <layout class="QHBoxLayout" name="horizontalLayout_52">
                <item>
-                 <widget class="QCheckBox" name="enableCooldown">
+                 <widget class="QLabel" name="label_21">
                  <property name="text">
-                   <string>AdvSceneSwitcher.generalTab.generalBehavior.cooldown</string>
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.logLevel</string>
                  </property>
                 </widget>
                </item>
                <item>
-                 <widget class="advss::DurationSelection" name="cooldownTime" native="true"/>
+                 <widget class="QComboBox" name="logLevel"/>
                </item>
                <item>
-                 <spacer name="horizontalSpacer_21">
+                 <spacer name="horizontalSpacer_49">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
@@ -441,80 +238,62 @@
               </layout>
              </item>
              <item>
-               <layout class="QGridLayout" name="gridLayout">
+               <widget class="QCheckBox" name="showTrayNotifications">
-                <item row="0" column="2">
+                <property name="text">
-                 <layout class="QHBoxLayout" name="horizontalLayout_43">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications</string>
-                  <item>
+                </property>
-                   <widget class="QRadioButton" name="noMatchDontSwitch">
+               </widget>
-                    <property name="text">
+              </item>
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch</string>
+              <item>
-                    </property>
+               <widget class="QCheckBox" name="warnPluginLoadFailure">
-                    <property name="checked">
+                <property name="text">
-                     <bool>true</bool>
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailure</string>
-                    </property>
+                </property>
-                   </widget>
+               </widget>
-                  </item>
+              </item>
-                 </layout>
+             </layout>
-                </item>
+            </widget>
-                <item row="2" column="2">
+           </item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_45">
+           <item>
-                  <item>
+            <widget class="QGroupBox" name="groupBox_6">
-                   <widget class="QRadioButton" name="noMatchRandomSwitch">
+             <property name="title">
-                    <property name="text">
+              <string>AdvSceneSwitcher.generalTab.uiBehavior</string>
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom</string>
+             </property>
-                    </property>
+             <layout class="QVBoxLayout" name="verticalLayout_2">
-                   </widget>
+              <item>
-                  </item>
+               <widget class="QCheckBox" name="saveWindowGeo">
-                 </layout>
+                <property name="text">
-                </item>
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo</string>
-                <item row="1" column="2">
+                </property>
-                 <layout class="QHBoxLayout" name="horizontalLayout">
+               </widget>
-                  <property name="leftMargin">
+              </item>
-                   <number>0</number>
+              <item>
-                  </property>
+               <widget class="QCheckBox" name="uiHintsDisable">
-                  <property name="topMargin">
+                <property name="text">
-                   <number>0</number>
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints</string>
-                  </property>
+                </property>
-                  <property name="rightMargin">
+               </widget>
-                   <number>0</number>
+              </item>
-                  </property>
+              <item>
-                  <property name="bottomMargin">
+               <widget class="QCheckBox" name="disableComboBoxFilter">
-                   <number>0</number>
+                <property name="text">
-                  </property>
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.comboBoxFilterDisable</string>
-                  <item>
+                </property>
-                   <widget class="QRadioButton" name="noMatchSwitch">
+               </widget>
-                    <property name="text">
+              </item>
-                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo</string>
+              <item>
-                    </property>
+               <widget class="QCheckBox" name="alwaysShowMacroSearch">
-                   </widget>
+                <property name="text">
-                  </item>
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch</string>
-                  <item>
+                </property>
-                   <widget class="advss::SceneSelectionWidget" name="noMatchSwitchScene">
+               </widget>
-                   </widget>
+              </item>
-                  </item>
+              <item>
-                 </layout>
+               <widget class="QCheckBox" name="hideLegacyTabs">
-                </item>
+                <property name="text">
-                <item row="1" column="1">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs</string>
-                 <layout class="QHBoxLayout" name="noMatchLayout">
+                </property>
-                  <item>
+               </widget>
                   <widget class="QLabel" name="label_2">
                    <property name="sizePolicy">
                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                      <horstretch>0</horstretch>
                      <verstretch>0</verstretch>
                     </sizepolicy>
                    </property>
                    <property name="text">
                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch</string>
                    </property>
                    <property name="alignment">
                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
                    </property>
                   </widget>
                  </item>
                 </layout>
                </item>
               </layout>
              </item>
             </layout>
            </widget>
@@ -562,6 +341,109 @@
             </layout>
            </widget>
           </item>
           <item>
            <widget class="QGroupBox" name="matchBehaviorBox">
             <property name="title">
              <string>AdvSceneSwitcher.generalTab.matchBehavior</string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_37">
              <item>
               <layout class="QHBoxLayout" name="cooldownLayout">
                <item>
                 <widget class="QCheckBox" name="enableCooldown">
                  <property name="text">
                   <string>AdvSceneSwitcher.generalTab.generalBehavior.cooldown</string>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="advss::DurationSelection" name="cooldownTime" native="true"/>
                </item>
                <item>
                 <spacer name="horizontalSpacer_21">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
                  <property name="sizeHint" stdset="0">
                   <size>
                    <width>40</width>
                    <height>20</height>
                   </size>
                  </property>
                 </spacer>
                </item>
               </layout>
              </item>
              <item>
               <layout class="QGridLayout" name="gridLayout">
                <item row="0" column="2">
                 <widget class="QRadioButton" name="noMatchDontSwitch">
                  <property name="text">
                   <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch</string>
                  </property>
                  <property name="checked">
                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
                <item row="2" column="2">
                 <widget class="QRadioButton" name="noMatchRandomSwitch">
                  <property name="text">
                   <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom</string>
                  </property>
                 </widget>
                </item>
                <item row="1" column="2">
                 <layout class="QHBoxLayout" name="horizontalLayout">
                  <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="QRadioButton" name="noMatchSwitch">
                    <property name="text">
                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo</string>
                    </property>
                   </widget>
                  </item>
                  <item>
                   <widget class="advss::SceneSelectionWidget" name="noMatchSwitchScene" native="true"/>
                  </item>
                 </layout>
                </item>
                <item row="1" column="1">
                 <layout class="QHBoxLayout" name="noMatchLayout">
                  <item>
                   <widget class="QLabel" name="label_2">
                    <property name="sizePolicy">
                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                      <horstretch>0</horstretch>
                      <verstretch>0</verstretch>
                     </sizepolicy>
                    </property>
                    <property name="text">
                     <string>AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch</string>
                    </property>
                    <property name="alignment">
                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
                    </property>
                   </widget>
                  </item>
                 </layout>
                </item>
               </layout>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <widget class="QGroupBox" name="priorityBox">
             <property name="title">
@@ -576,15 +458,7 @@
               </widget>
              </item>
              <item>
-               <layout class="QVBoxLayout" name="verticalLayout_10">
+               <widget class="QListWidget" name="priorityList"/>
                <item>
                 <layout class="QHBoxLayout" name="horizontalLayout_41">
                  <item>
                   <widget class="QListWidget" name="priorityList"/>
                  </item>
                 </layout>
                </item>
               </layout>
              </item>
              <item>
               <layout class="QHBoxLayout" name="horizontalLayout_32">
@@ -721,6 +595,55 @@
             </property>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="macroSearchLayout">
             <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="QLineEdit" name="macroSearchText">
               <property name="placeholderText">
                <string>AdvSceneSwitcher.macroTab.search.placeholder</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QPushButton" name="macroSearchClear">
               <property name="toolTip">
                <string>AdvSceneSwitcher.variableTab.clear</string>
               </property>
               <property name="text">
                <string/>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QComboBox" name="macroSearchType"/>
             </item>
             <item>
              <widget class="advss::RegexConfigWidget" name="macroSearchRegex" native="true"/>
             </item>
             <item>
              <widget class="QPushButton" name="macroSearchShowSettings">
               <property name="toolTip">
                <string>AdvSceneSwitcher.macroTab.search.showSettings</string>
               </property>
               <property name="text">
                <string/>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
            <widget class="advss::MacroTree" name="macros">
             <property name="showDropIndicator" stdset="0">
@@ -4164,12 +4087,7 @@
  <tabstop>autoStartSceneName</tabstop>
  <tabstop>autoStartSceneNameRegex</tabstop>
  <tabstop>logLevel</tabstop>
  <tabstop>saveWindowGeo</tabstop>
  <tabstop>showTrayNotifications</tabstop>
  <tabstop>uiHintsDisable</tabstop>
  <tabstop>disableComboBoxFilter</tabstop>
  <tabstop>warnPluginLoadFailure</tabstop>
  <tabstop>hideLegacyTabs</tabstop>
  <tabstop>exportSettings</tabstop>
  <tabstop>importSettings</tabstop>
  <tabstop>noMatchDontSwitch</tabstop>
--- a/lib/advanced-scene-switcher.hpp
+++ b/lib/advanced-scene-switcher.hpp
@@ -65,7 +65,6 @@ public slots:
 	void on_showTrayNotifications_stateChanged(int state);
 	void on_uiHintsDisable_stateChanged(int state);
 	void on_disableComboBoxFilter_stateChanged(int state);
 	void on_disableMacroWidgetCache_stateChanged(int state);
 	void on_warnPluginLoadFailure_stateChanged(int state);
 	void on_hideLegacyTabs_stateChanged(int state);
 	void on_priorityUp_clicked();
--- a/lib/general.cpp
+++ b/lib/general.cpp
@@ -3,6 +3,7 @@
 #include "filter-combo-box.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
 #include "macro-search.hpp"
 #include "macro-settings.hpp"
 #include "path-helpers.hpp"
 #include "selection-helpers.hpp"
@@ -185,16 +186,6 @@ void AdvSceneSwitcher::on_disableComboBoxFilter_stateChanged(int state)
 	FilterComboBox::SetFilterBehaviourEnabled(!state);
 }
 void AdvSceneSwitcher::on_disableMacroWidgetCache_stateChanged(int state)
 {
 	if (loading) {
 		return;
 	}
 	switcher->disableMacroWidgetCache = state;
 	MacroSegmentList::SetCachingEnabled(!state);
 }
 void AdvSceneSwitcher::on_warnPluginLoadFailure_stateChanged(int state)
 {
 	if (loading) {
@@ -531,8 +522,6 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 	obs_data_set_bool(obj, "disableHints", disableHints);
 	obs_data_set_bool(obj, "disableFilterComboboxFilter",
 			  disableFilterComboboxFilter);
 	obs_data_set_bool(obj, "disableMacroWidgetCache",
 			  disableMacroWidgetCache);
 	obs_data_set_bool(obj, "warnPluginLoadFailure", warnPluginLoadFailure);
 	obs_data_set_bool(obj, "hideLegacyTabs", hideLegacyTabs);
@@ -602,8 +591,6 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj)
 	disableHints = obs_data_get_bool(obj, "disableHints");
 	disableFilterComboboxFilter =
 		obs_data_get_bool(obj, "disableFilterComboboxFilter");
 	disableMacroWidgetCache =
 		obs_data_get_bool(obj, "disableMacroWidgetCache");
 	obs_data_set_default_bool(obj, "warnPluginLoadFailure", true);
 	warnPluginLoadFailure = obs_data_get_bool(obj, "warnPluginLoadFailure");
 	obs_data_set_default_bool(obj, "hideLegacyTabs", true);
@@ -927,9 +914,6 @@ void AdvSceneSwitcher::SetupGeneralTab()
 		switcher->disableFilterComboboxFilter);
 	FilterComboBox::SetFilterBehaviourEnabled(
 		!switcher->disableFilterComboboxFilter);
 	ui->disableMacroWidgetCache->setChecked(
 		switcher->disableMacroWidgetCache);
 	MacroSegmentList::SetCachingEnabled(!switcher->disableMacroWidgetCache);
 	ui->warnPluginLoadFailure->setChecked(switcher->warnPluginLoadFailure);
 	ui->hideLegacyTabs->setChecked(switcher->hideLegacyTabs);
@@ -1013,6 +997,19 @@ void AdvSceneSwitcher::SetupGeneralTab()
 			switcher->CheckAutoStart();
 		});
 	ui->alwaysShowMacroSearch->setChecked(
 		GetMacroSearchSettings().showAlways);
 	connect(ui->alwaysShowMacroSearch, &QCheckBox::stateChanged, this,
 		[this](int enabled) {
 			GetMacroSearchSettings().showAlways = enabled;
 			if (loading) {
 				return;
 			}
 			CheckMacroSearchVisibility();
 		});
 	// Set up status control
 	auto statusControl = new StatusControl(this, true);
 	ui->statusLayout->addWidget(statusControl->StatusPrefixLabel(), 1, 0);
--- a/lib/macro/macro-action-edit.cpp
+++ b/lib/macro/macro-action-edit.cpp
@@ -28,8 +28,7 @@ static inline void populateActionSelection(QComboBox *list)
 }
 MacroActionEdit::MacroActionEdit(QWidget *parent,
-				 std::shared_ptr<MacroAction> *entryData,
+				 std::shared_ptr<MacroAction> *entryData)
 				 const std::string &id)
 	: MacroSegmentEdit(parent),
 	  _actionSelection(new FilterComboBox()),
 	  _enable(new SwitchButton()),
--- a/lib/macro/macro-action-edit.hpp
+++ b/lib/macro/macro-action-edit.hpp
@@ -13,10 +13,8 @@ class MacroActionEdit : public MacroSegmentEdit {
 	Q_OBJECT
 public:
-	MacroActionEdit(
+	MacroActionEdit(QWidget *parent = nullptr,
-		QWidget *parent = nullptr,
+			std::shared_ptr<MacroAction> * = nullptr);
 		std::shared_ptr<MacroAction> * = nullptr,
 		const std::string &id = MacroAction::GetDefaultID().data());
 	void SetupWidgets(bool basicSetup = false);
 	void SetEntryData(std::shared_ptr<MacroAction> *);
--- a/lib/macro/macro-action-variable.cpp
+++ b/lib/macro/macro-action-variable.cpp
@@ -286,6 +286,14 @@ bool MacroActionVariable::PerformAction()
 	case Action::APPEND:
 		apppend(*var, _strValue);
 		break;
 	case Action::COPY_VAR: {
 		auto var2 = _variable2.lock();
 		if (!var2) {
 			return true;
 		}
 		var->SetValue(var2->Value());
 		break;
 	}
 	case Action::APPEND_VAR: {
 		auto var2 = _variable2.lock();
 		if (!var2) {
@@ -670,6 +678,8 @@ static inline void populateActionSelection(QComboBox *list)
 		actions = {
 			{MacroActionVariable::Action::SET_VALUE,
 			 "AdvSceneSwitcher.action.variable.type.set"},
 			{MacroActionVariable::Action::COPY_VAR,
 			 "AdvSceneSwitcher.action.variable.type.copy"},
 			{MacroActionVariable::Action::APPEND,
 			 "AdvSceneSwitcher.action.variable.type.append"},
 			{MacroActionVariable::Action::PAD,
@@ -1521,6 +1531,7 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 	}
 	_variables2->setVisible(
 		_entryData->_action == MacroActionVariable::Action::COPY_VAR ||
 		_entryData->_action ==
 			MacroActionVariable::Action::APPEND_VAR ||
 		_entryData->_action ==
--- a/lib/macro/macro-action-variable.hpp
+++ b/lib/macro/macro-action-variable.hpp
@@ -55,6 +55,7 @@ public:
 		RANDOM_NUMBER,
 		QUERY_JSON,
 		ARRAY_JSON,
 		COPY_VAR,
 	};
 	Action _action = Action::SET_VALUE;
--- a/lib/macro/macro-condition-edit.cpp
+++ b/lib/macro/macro-condition-edit.cpp
@@ -100,7 +100,7 @@ void DurationModifierEdit::Collapse(bool collapse)
 MacroConditionEdit::MacroConditionEdit(
 	QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
-	const std::string &id, bool isRootCondition)
+	bool isRootCondition)
 	: MacroSegmentEdit(parent),
 	  _logicSelection(new QComboBox()),
 	  _conditionSelection(new FilterComboBox()),
--- a/lib/macro/macro-condition-edit.hpp
+++ b/lib/macro/macro-condition-edit.hpp
@@ -34,11 +34,9 @@ class MacroConditionEdit : public MacroSegmentEdit {
 	Q_OBJECT
 public:
-	MacroConditionEdit(
+	MacroConditionEdit(QWidget *parent = nullptr,
-		QWidget *parent = nullptr,
+			   std::shared_ptr<MacroCondition> * = nullptr,
-		std::shared_ptr<MacroCondition> * = nullptr,
+			   bool root = true);
 		const std::string &id = MacroCondition::GetDefaultID().data(),
 		bool root = true);
 	bool IsRootNode() const;
 	void SetRootNode(bool);
 	void SetupWidgets(bool basicSetup = false);
--- a/lib/macro/macro-dock.cpp
+++ b/lib/macro/macro-dock.cpp
@@ -110,7 +110,7 @@ void MacroDock::RunClicked()
 		return;
 	}
-	auto ret = macro->PerformActions(true);
+	auto ret = macro->PerformActions(true, true, true);
 	if (!ret) {
 		QString err =
 			obs_module_text("AdvSceneSwitcher.macroTab.runFail");
--- a/lib/macro/macro-edit.cpp
+++ b/lib/macro/macro-edit.cpp
@@ -418,8 +418,7 @@ void MacroEdit::PopulateMacroActions(Macro &m, uint32_t afterIdx)
 	ui->actionsList->SetVisibilityCheckEnable(false);
 	for (; afterIdx < actions.size(); afterIdx++) {
-		auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
+		auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
 						    actions[afterIdx]->GetId());
 		ui->actionsList->Add(newEntry);
 	}
@@ -444,8 +443,7 @@ void MacroEdit::PopulateMacroElseActions(Macro &m, uint32_t afterIdx)
 	ui->elseActionsList->SetVisibilityCheckEnable(false);
 	for (; afterIdx < actions.size(); afterIdx++) {
-		auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
+		auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
 						    actions[afterIdx]->GetId());
 		ui->elseActionsList->Add(newEntry);
 	}
@@ -472,8 +470,7 @@ void MacroEdit::PopulateMacroConditions(Macro &m, uint32_t afterIdx)
 	for (; afterIdx < conditions.size(); afterIdx++) {
 		auto newEntry = new MacroConditionEdit(
-			this, &conditions[afterIdx],
+			this, &conditions[afterIdx], root);
 			conditions[afterIdx]->GetId(), root);
 		ui->conditionsList->Add(newEntry);
 		root = false;
 	}
@@ -1083,8 +1080,7 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id,
 		RunAndClearPostLoadSteps();
 		macro->UpdateActionIndices();
 		ui->actionsList->Insert(
-			idx,
+			idx, new MacroActionEdit(this, &macro->Actions()[idx]));
 			new MacroActionEdit(this, &macro->Actions()[idx], id));
 		SetActionData(*macro);
 	}
 	HighlightAction(idx);
@@ -1386,8 +1382,8 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id,
 		RunAndClearPostLoadSteps();
 		macro->UpdateElseActionIndices();
 		ui->elseActionsList->Insert(
-			idx, new MacroActionEdit(
+			idx,
-				     this, &macro->ElseActions()[idx], id));
+			new MacroActionEdit(this, &macro->ElseActions()[idx]));
 		SetElseActionData(*macro);
 	}
 	HighlightElseAction(idx);
@@ -1589,7 +1585,7 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
 		ui->conditionsList->Insert(
 			idx,
 			new MacroConditionEdit(this, &macro->Conditions()[idx],
-					       id, idx == 0));
+					       idx == 0));
 		SetConditionData(*macro);
 	}
 	HighlightCondition(idx);
--- a/lib/macro/macro-helpers.cpp
+++ b/lib/macro/macro-helpers.cpp
@@ -63,6 +63,33 @@ std::deque<std::shared_ptr<Macro>> GetAllMacros()
 	return macros;
 }
 Macro *GetMacroByName(const char *name)
 {
 	for (const auto &m : GetTopLevelMacros()) {
 		if (m->Name() == name) {
 			return m.get();
 		}
 	}
 	return nullptr;
 }
 Macro *GetMacroByQString(const QString &name)
 {
 	return GetMacroByName(name.toUtf8().constData());
 }
 std::weak_ptr<Macro> GetWeakMacroByName(const char *name)
 {
 	for (const auto &m : GetTopLevelMacros()) {
 		if (m->Name() == name) {
 			return m;
 		}
 	}
 	return {};
 }
 std::optional<std::deque<std::shared_ptr<MacroAction>>>
 GetMacroActions(Macro *macro)
 {
--- a/lib/macro/macro-helpers.hpp
+++ b/lib/macro/macro-helpers.hpp
@@ -1,6 +1,8 @@
 #pragma once
 #include "export-symbol-helper.hpp"
 #include <QString>
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -22,6 +24,10 @@ EXPORT std::deque<std::shared_ptr<Macro>> &GetTopLevelMacros();
 std::deque<std::shared_ptr<Macro>> &GetTemporaryMacros();
 EXPORT std::deque<std::shared_ptr<Macro>> GetAllMacros();
 Macro *GetMacroByName(const char *name);
 Macro *GetMacroByQString(const QString &name);
 std::weak_ptr<Macro> GetWeakMacroByName(const char *name);
 EXPORT std::optional<std::deque<std::shared_ptr<MacroAction>>>
 GetMacroActions(Macro *);
 EXPORT std::optional<std::deque<std::shared_ptr<MacroAction>>>
--- a/lib/macro/macro-search.cpp
+++ b/lib/macro/macro-search.cpp
@@ -0,0 +1,336 @@
 #include "macro-search.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
 #include "macro-action-factory.hpp"
 #include "macro-condition-factory.hpp"
 #include "macro-helpers.hpp"
 #include "macro-signals.hpp"
 #include "plugin-state-helpers.hpp"
 #include "ui-helpers.hpp"
 #include <obs.hpp>
 #include <QComboBox>
 #include <QLayout>
 #include <QLineEdit>
 #include <QPushButton>
 namespace advss {
 static bool searchEnabled = false;
 static bool setup();
 static bool setupDone = setup();
 static QLayout *searchLayout = nullptr;
 static QComboBox *searchType = nullptr;
 static RegexConfigWidget *searchRegex = nullptr;
 static QPushButton *showSettings = nullptr;
 static std::function<void()> refreshFilter;
 static void save(obs_data_t *data)
 {
 	GetMacroSearchSettings().Save(data, "macroSearchSettings");
 }
 static void load(obs_data_t *data)
 {
 	GetMacroSearchSettings().Load(data, "macroSearchSettings");
 }
 static bool setup()
 {
 	AddSaveStep(save);
 	AddLoadStep(load);
 	return true;
 }
 void MacroSearchSettings::Save(obs_data_t *data, const char *name)
 {
 	OBSDataAutoRelease settings = obs_data_create();
 	obs_data_set_bool(settings, "showAlways", showAlways);
 	obs_data_set_int(settings, "searchType", static_cast<int>(searchType));
 	obs_data_set_string(settings, "searchString", searchString.c_str());
 	regex.Save(settings);
 	obs_data_set_obj(data, name, settings);
 }
 void MacroSearchSettings::Load(obs_data_t *data, const char *name)
 {
 	OBSDataAutoRelease settings = obs_data_get_obj(data, name);
 	showAlways = obs_data_get_bool(settings, "showAlways");
 	searchType = static_cast<SearchType>(
 		obs_data_get_int(settings, "searchType"));
 	searchString = obs_data_get_string(settings, "searchString");
 	regex.Load(settings);
 }
 static void showAdvancedSearchSettings(bool show)
 {
 	assert(searchType);
 	assert(searchRegex);
 	searchType->setVisible(show);
 	searchRegex->setVisible(show);
 }
 static bool shouldShowSearch()
 {
 	static const int showSearchThreshold = 10;
 	return GetMacroSearchSettings().showAlways ||
 	       GetTopLevelMacros().size() >= showSearchThreshold;
 }
 void CheckMacroSearchVisibility()
 {
 	assert(searchLayout);
 	assert(searchType);
 	assert(searchRegex);
 	assert(showSettings);
 	searchEnabled = shouldShowSearch();
 	SetLayoutVisible(searchLayout, searchEnabled);
 	showAdvancedSearchSettings(false);
 	showSettings->setChecked(false);
 	refreshFilter();
 }
 void SetupMacroSearchWidgets(QLayout *searchLayoutArg, QLineEdit *searchText,
 			     QPushButton *searchClear, QComboBox *searchTypeArg,
 			     RegexConfigWidget *searchRegexArg,
 			     QPushButton *showSettingsArg,
 			     const std::function<void()> &refreshArg)
 {
 	searchLayout = searchLayoutArg;
 	searchType = searchTypeArg;
 	searchRegex = searchRegexArg;
 	refreshFilter = refreshArg;
 	showSettings = showSettingsArg;
 	searchClear->setMaximumWidth(22);
 	SetButtonIcon(searchClear, GetThemeTypeName() == "Light"
 					   ? "theme:Light/close.svg"
 					   : "theme:Dark/close.svg");
 	searchClear->setDisabled(GetMacroSearchSettings().searchString.empty());
 	QWidget::connect(searchClear, &QPushButton::clicked, searchClear,
 			 [=]() {
 				 searchText->setText("");
 				 searchClear->setDisabled(true);
 			 });
 	const auto ph = searchText->placeholderText();
 	const QFontMetrics fm(searchText->font());
 	const int width = fm.horizontalAdvance(ph);
 	// Add a little padding so the text isn't cramped
 	searchText->setMinimumWidth(width + 10);
 	searchText->setText(
 		QString::fromStdString(GetMacroSearchSettings().searchString));
 	QWidget::connect(searchText, &QLineEdit::textChanged, searchText,
 			 [searchClear](const QString &text) {
 				 GetMacroSearchSettings().searchString =
 					 text.toStdString();
 				 searchClear->setDisabled(text.isEmpty());
 				 refreshFilter();
 			 });
 	searchType->addItem(
 		obs_module_text("AdvSceneSwitcher.macroTab.search.name"),
 		static_cast<int>(MacroSearchSettings::SearchType::NAME));
 	searchType->addItem(
 		obs_module_text("AdvSceneSwitcher.macroTab.search.allSegments"),
 		static_cast<int>(
 			MacroSearchSettings::SearchType::ALL_SEGMENTS));
 	searchType->addItem(
 		obs_module_text("AdvSceneSwitcher.macroTab.search.conditions"),
 		static_cast<int>(MacroSearchSettings::SearchType::CONDITIONS));
 	searchType->addItem(
 		obs_module_text("AdvSceneSwitcher.macroTab.search.actions"),
 		static_cast<int>(MacroSearchSettings::SearchType::ACTIONS));
 	searchType->addItem(
 		obs_module_text("AdvSceneSwitcher.macroTab.search.label"),
 		static_cast<int>(MacroSearchSettings::SearchType::LABEL));
 	searchType->setCurrentIndex(searchType->findData(
 		static_cast<int>(GetMacroSearchSettings().searchType)));
 	QWidget::connect(
 		searchType, &QComboBox::currentIndexChanged, searchType, []() {
 			GetMacroSearchSettings().searchType =
 				static_cast<MacroSearchSettings::SearchType>(
 					searchType->currentData().toInt());
 			refreshFilter();
 		});
 	searchRegex->SetRegexConfig(GetMacroSearchSettings().regex);
 	QWidget::connect(searchRegex, &RegexConfigWidget::RegexConfigChanged,
 			 searchRegex, [](const RegexConfig &regex) {
 				 GetMacroSearchSettings().regex = regex;
 				 refreshFilter();
 			 });
 	showSettings->setCheckable(true);
 	showSettings->setMaximumWidth(11);
 	SetButtonIcon(showSettings, GetThemeTypeName() == "Light"
 					    ? ":/res/images/dots-vert.svg"
 					    : "theme:Dark/dots-vert.svg");
 	QWidget::connect(showSettings, &QPushButton::toggled, showSettings,
 			 showAdvancedSearchSettings);
 	QWidget::connect(MacroSignalManager::Instance(),
 			 &MacroSignalManager::Rename, searchText,
 			 []() { refreshFilter(); });
 	CheckMacroSearchVisibility();
 }
 MacroSearchSettings &GetMacroSearchSettings()
 {
 	static MacroSearchSettings settings;
 	return settings;
 }
 static bool stringMatches(const std::string &text)
 {
 	const auto &settings = GetMacroSearchSettings();
 	const auto &regex = settings.regex;
 	const auto &searchString = settings.searchString;
 	if (regex.Enabled()) {
 		return regex.Matches(text, searchString);
 	}
 	return QString::fromStdString(text).contains(
 		QString::fromStdString(searchString), Qt::CaseInsensitive);
 }
 static bool segmentTypeMatches(MacroSegment *segment, bool isCondition)
 {
 	if (!segment) {
 		return false;
 	}
 	const auto getNameFromId =
 		isCondition ? MacroConditionFactory::GetConditionName
 			    : MacroActionFactory::GetActionName;
 	const auto name = getNameFromId(segment->GetId());
 	return stringMatches(obs_module_text(name.c_str()));
 }
 static bool segmentLabelMatches(MacroSegment *segment)
 {
 	if (!segment) {
 		return false;
 	}
 	if (!segment->GetUseCustomLabel()) {
 		return false;
 	}
 	const auto label = segment->GetCustomLabel();
 	return stringMatches(label);
 }
 bool MacroMatchesSearchFilter(Macro *macro)
 {
 	assert(macro);
 	if (!searchEnabled) {
 		return true;
 	}
 	const auto &settings = GetMacroSearchSettings();
 	if (settings.searchString.empty()) {
 		return true;
 	}
 	if (macro->IsGroup()) {
 		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;
 			}
 		}
 		return false;
 	}
 	switch (settings.searchType) {
 	case MacroSearchSettings::SearchType::NAME: {
 		const auto name = macro->Name();
 		return stringMatches(name);
 	}
 	case MacroSearchSettings::SearchType::ALL_SEGMENTS:
 		for (const auto &condition : macro->Conditions()) {
 			if (segmentTypeMatches(condition.get(), true)) {
 				return true;
 			}
 		}
 		for (const auto &action : macro->Actions()) {
 			if (segmentTypeMatches(action.get(), false)) {
 				return true;
 			}
 		}
 		for (const auto &action : macro->ElseActions()) {
 			if (segmentTypeMatches(action.get(), false)) {
 				return true;
 			}
 		}
 		return false;
 	case MacroSearchSettings::SearchType::CONDITIONS:
 		for (const auto &condition : macro->Conditions()) {
 			if (segmentTypeMatches(condition.get(), true)) {
 				return true;
 			}
 		}
 		return false;
 	case MacroSearchSettings::SearchType::ACTIONS:
 		for (const auto &action : macro->Actions()) {
 			if (segmentTypeMatches(action.get(), false)) {
 				return true;
 			}
 		}
 		for (const auto &action : macro->ElseActions()) {
 			if (segmentTypeMatches(action.get(), false)) {
 				return true;
 			}
 		}
 		return false;
 	case MacroSearchSettings::SearchType::LABEL:
 		for (const auto &condition : macro->Conditions()) {
 			if (segmentLabelMatches(condition.get())) {
 				return true;
 			}
 		}
 		for (const auto &action : macro->Actions()) {
 			if (segmentLabelMatches(action.get())) {
 				return true;
 			}
 		}
 		for (const auto &action : macro->ElseActions()) {
 			if (segmentLabelMatches(action.get())) {
 				return true;
 			}
 		}
 		return false;
 	default:
 		break;
 	}
 	// Unhandled search type
 	assert(false);
 	return true;
 }
 } // namespace advss
--- a/lib/macro/macro-search.hpp
+++ b/lib/macro/macro-search.hpp
@@ -0,0 +1,43 @@
 #pragma once
 #include "regex-config.hpp"
 #include <functional>
 #include <string>
 class QComboBox;
 class QLayout;
 class QLineEdit;
 class QPushButton;
 namespace advss {
 class Macro;
 struct MacroSearchSettings {
 	void Save(obs_data_t *data, const char *name);
 	void Load(obs_data_t *data, const char *name);
 	enum class SearchType {
 		NAME = 0,
 		ALL_SEGMENTS = 10,
 		CONDITIONS = 20,
 		ACTIONS = 30,
 		LABEL = 40,
 	};
 	SearchType searchType = SearchType::NAME;
 	std::string searchString;
 	RegexConfig regex;
 	bool showAlways = false;
 };
 void CheckMacroSearchVisibility();
 void SetupMacroSearchWidgets(QLayout *searchLayout, QLineEdit *searchText,
 			     QPushButton *searchClear, QComboBox *searchType,
 			     RegexConfigWidget *searchRegex,
 			     QPushButton *showSettings,
 			     const std::function<void()> &refresh);
 MacroSearchSettings &GetMacroSearchSettings();
 bool MacroMatchesSearchFilter(Macro *macro);
 } // namespace advss
--- a/lib/macro/macro-tab.cpp
+++ b/lib/macro/macro-tab.cpp
@@ -4,6 +4,7 @@
 #include "macro-condition-edit.hpp"
 #include "macro-export-import-dialog.hpp"
 #include "macro-settings.hpp"
 #include "macro-search.hpp"
 #include "macro-signals.hpp"
 #include "macro-tree.hpp"
 #include "macro.hpp"
@@ -207,7 +208,7 @@ void AdvSceneSwitcher::RemoveMacro(std::shared_ptr<Macro> &macro)
 	// Don't cache widgets for about to be deleted macros
 	MacroSegmentList::SetCachingEnabled(false);
 	ui->macros->Remove(macro);
-	MacroSegmentList::SetCachingEnabled(!switcher->disableMacroWidgetCache);
+	MacroSegmentList::SetCachingEnabled(true);
 	MacroSignalManager::Instance()->Remove(name);
 }
@@ -615,17 +616,20 @@ setupToolBar(const std::initializer_list<std::initializer_list<QWidget *>>
 	auto toolbar = new QToolBar();
 	toolbar->setIconSize({16, 16});
-	QAction *lastSeperator = nullptr;
+	QAction *lastSeparator = nullptr;
 	for (const auto &widgetGroup : widgetGroups) {
 		for (const auto &widget : widgetGroup) {
 			if (!widget) {
 				continue;
 			}
 			toolbar->addWidget(widget);
 		}
-		lastSeperator = toolbar->addSeparator();
+		lastSeparator = toolbar->addSeparator();
 	}
-	if (lastSeperator) {
+	if (lastSeparator) {
-		toolbar->removeAction(lastSeperator);
+		toolbar->removeAction(lastSeparator);
 	}
 	// Prevent "extension" button from showing up
@@ -638,7 +642,9 @@ void AdvSceneSwitcher::SetupMacroTab()
 {
 	ui->macros->installEventFilter(this);
-	if (GetTopLevelMacros().size() == 0 && !switcher->disableHints) {
+	auto &macros = GetTopLevelMacros();
 	if (macros.size() == 0 && !switcher->disableHints) {
 		addPulse = HighlightWidget(ui->macroAdd, QColor(Qt::green));
 	}
@@ -646,8 +652,7 @@ void AdvSceneSwitcher::SetupMacroTab()
 					   {ui->macroUp, ui->macroDown}});
 	ui->macroControlLayout->addWidget(macroControls);
-	ui->macros->Reset(GetTopLevelMacros(),
+	ui->macros->Reset(macros, GetGlobalMacroSettings()._highlightExecuted);
 			  GetGlobalMacroSettings()._highlightExecuted);
 	connect(ui->macros, SIGNAL(MacroSelectionChanged()), this,
 		SLOT(MacroSelectionChanged()));
 	ui->runMacro->SetMacroTree(ui->macros);
@@ -676,6 +681,12 @@ void AdvSceneSwitcher::SetupMacroTab()
 				switcher->macroListMacroEditSplitterPosition);
 		}
 	}
 	SetupMacroSearchWidgets(ui->macroSearchLayout, ui->macroSearchText,
 				ui->macroSearchClear, ui->macroSearchType,
 				ui->macroSearchRegex,
 				ui->macroSearchShowSettings,
 				[this]() { ui->macros->RefreshFilter(); });
 }
 void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)
--- a/lib/macro/macro-tree.cpp
+++ b/lib/macro/macro-tree.cpp
@@ -1,5 +1,6 @@
 #include "macro-tree.hpp"
 #include "macro.hpp"
 #include "macro-search.hpp"
 #include "macro-signals.hpp"
 #include "path-helpers.hpp"
 #include "sync-helpers.hpp"
@@ -783,7 +784,8 @@ void MacroTree::Reset(std::deque<std::shared_ptr<Macro>> &macros,
 		      bool highlight)
 {
 	_highlight = highlight;
-	MacroTreeModel *mtm = new MacroTreeModel(this, macros);
+
 	auto mtm = new MacroTreeModel(this, macros);
 	setModel(mtm);
 	GetModel()->Reset(macros);
 	connect(selectionModel(),
@@ -869,7 +871,7 @@ void MacroTree::UpdateWidgets(bool force)
 	for (int i = 0; i < (int)mtm->_macros.size(); i++) {
 		std::shared_ptr<Macro> item = mtm->_macros[i];
-		MacroTreeItem *widget = GetItemWidget(i);
+		auto widget = GetItemWidget(i);
 		if (!widget) {
 			UpdateWidget(mtm->createIndex(i, 0, nullptr), item);
@@ -1204,6 +1206,12 @@ void MacroTree::CollapseGroup(std::shared_ptr<Macro> item) const
 	mtm->CollapseGroup(item);
 }
 void MacroTree::RefreshFilter()
 {
 	UpdateWidgets();
 	doItemsLayout();
 }
 void MacroTree::MoveItemBefore(const std::shared_ptr<Macro> &item,
 			       const std::shared_ptr<Macro> &after) const
 {
@@ -1218,7 +1226,7 @@ void MacroTree::MoveItemAfter(const std::shared_ptr<Macro> &item,
 MacroTreeModel *MacroTree::GetModel() const
 {
-	return reinterpret_cast<MacroTreeModel *>(model());
+	return qobject_cast<MacroTreeModel *>(model());
 }
 void MacroTree::Remove(std::shared_ptr<Macro> item) const
@@ -1333,8 +1341,8 @@ void MacroTree::SelectionChangedHelper(const QItemSelection &,
 inline MacroTreeItem *MacroTree::GetItemWidget(int idx) const
 {
-	QWidget *widget = indexWidget(GetModel()->createIndex(idx, 0, nullptr));
+	auto widget = indexWidget(GetModel()->createIndex(idx, 0, nullptr));
-	return reinterpret_cast<MacroTreeItem *>(widget);
+	return qobject_cast<MacroTreeItem *>(widget);
 }
 void MacroTree::paintEvent(QPaintEvent *event)
@@ -1361,14 +1369,25 @@ MacroTreeDelegate::MacroTreeDelegate(QObject *parent)
 QSize MacroTreeDelegate::sizeHint(const QStyleOptionViewItem &option,
 				  const QModelIndex &index) const
 {
-	MacroTree *tree = qobject_cast<MacroTree *>(parent());
+	auto tree = qobject_cast<MacroTree *>(parent());
-	QWidget *item = tree->indexWidget(index);
+	auto widget = tree->indexWidget(index);
-	if (!item) {
+	if (!widget) {
 		return QStyledItemDelegate::sizeHint(option, index);
 	}
-	return QSize(item->sizeHint());
+	auto name = index.data(Qt::AccessibleTextRole).toString();
 	auto macro = GetMacroByQString(name);
 	if (!macro) {
 		return QStyledItemDelegate::sizeHint(option, index);
 	}
 	if (MacroMatchesSearchFilter(macro)) {
 		return QSize(widget->sizeHint());
 	}
 	return QSize(0, 0);
 }
 } // namespace advss
--- a/lib/macro/macro-tree.hpp
+++ b/lib/macro/macro-tree.hpp
@@ -142,6 +142,7 @@ public:
 	bool GroupsExist() const;
 	void ExpandGroup(std::shared_ptr<Macro> item) const;
 	void CollapseGroup(std::shared_ptr<Macro> item) const;
 	void RefreshFilter();
 public slots:
 	void GroupSelectedItems();
--- a/lib/macro/macro.cpp
+++ b/lib/macro/macro.cpp
@@ -1255,33 +1255,6 @@ void StopAllMacros()
 	}
 }
 Macro *GetMacroByName(const char *name)
 {
 	for (const auto &m : GetTopLevelMacros()) {
 		if (m->Name() == name) {
 			return m.get();
 		}
 	}
 	return nullptr;
 }
 Macro *GetMacroByQString(const QString &name)
 {
 	return GetMacroByName(name.toUtf8().constData());
 }
 std::weak_ptr<Macro> GetWeakMacroByName(const char *name)
 {
 	for (const auto &m : GetTopLevelMacros()) {
 		if (m->Name() == name) {
 			return m;
 		}
 	}
 	return {};
 }
 void InvalidateMacroTempVarValues()
 {
 	for (const auto &m : GetTopLevelMacros()) {
--- a/lib/macro/macro.hpp
+++ b/lib/macro/macro.hpp
@@ -9,8 +9,6 @@
 #include "temp-variable.hpp"
 #include <future>
 #include <QString>
 #include <QByteArray>
 #include <string>
 #include <deque>
 #include <memory>
@@ -220,9 +218,6 @@ void SaveMacros(obs_data_t *obj);
 bool CheckMacros();
 bool RunMacros();
 void StopAllMacros();
 Macro *GetMacroByName(const char *name);
 Macro *GetMacroByQString(const QString &name);
 std::weak_ptr<Macro> GetWeakMacroByName(const char *name);
 void InvalidateMacroTempVarValues();
 std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval();
--- a/lib/osx/advanced-scene-switcher-osx.mm
+++ b/lib/osx/advanced-scene-switcher-osx.mm
@@ -258,7 +258,7 @@ bool IsFullscreen(const std::string &title)
 	return false;
 }
-std::optional<std::string> GetTextInWindow(const std::string &window)
+std::optional<std::string> GetTextInWindow(const std::string &)
 {
 	// Not implemented
 	return {};
--- a/lib/queue/action-queue.cpp
+++ b/lib/queue/action-queue.cpp
@@ -423,7 +423,7 @@ void ImportQueues(obs_data_t *data)
 		importedQueues->emplace_back(queue);
 	}
-	QeueUITask(signalImportedQueues, importedQueues);
+	QueueUITask(signalImportedQueues, importedQueues);
 }
 std::weak_ptr<ActionQueue> GetWeakActionQueueByName(const std::string &name)
--- a/lib/switcher-data.hpp
+++ b/lib/switcher-data.hpp
@@ -163,7 +163,6 @@ public:
 	bool warnPluginLoadFailure = true;
 	bool disableHints = false;
 	bool disableFilterComboboxFilter = false;
 	bool disableMacroWidgetCache = false;
 	bool hideLegacyTabs = true;
 	bool saveWindowGeo = false;
 	QPoint windowPos = {};
--- a/lib/utils/canvas-helpers.cpp
+++ b/lib/utils/canvas-helpers.cpp
@@ -67,7 +67,7 @@ int GetCanvasCount()
 	return 1;
 #else
 	static const auto enumCanvases = [](void *countPtr,
-					    obs_canvas_t *canvas) -> bool {
+					    obs_canvas_t *) -> bool {
 		auto count = static_cast<int *>(countPtr);
 		(*count)++;
 		return true;
@@ -145,6 +145,15 @@ OBSWeakSource GetActiveCanvasScene(const OBSWeakCanvas &weakCanvas)
 	}
 #endif
 	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
 	// The frontend scene order does not necessarily match the order of the
 	// scenes in the canvas.
 	if (canvas == mainCanvas) {
 		OBSSourceAutoRelease scene = obs_frontend_get_current_scene();
 		return OBSGetWeakRef(scene);
 	}
 	static const auto enumCanvasScenes = [](void *scenePtr,
 						obs_source_t *source) -> bool {
 		auto scene = static_cast<OBSWeakSource *>(scenePtr);
@@ -181,6 +190,25 @@ OBSWeakSource GetSceneAtIndex(const OBSWeakCanvas &weakCanvas, int idx)
 	}
 #endif
 	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
 	// The frontend scene order does not necessarily match the order of the
 	// scenes in the canvas.
 	// So, rely on obs_frontend_get_scenes() in case of the main canvas
 	// instead.
 	if (canvas == mainCanvas) {
 		struct obs_frontend_source_list scenes = {0};
 		obs_frontend_get_scenes(&scenes);
 		if (idx >= (int)scenes.sources.num) {
 			obs_frontend_source_list_free(&scenes);
 			return nullptr;
 		}
 		auto scene = OBSGetWeakRef(scenes.sources.array[idx]);
 		obs_frontend_source_list_free(&scenes);
 		return scene;
 	}
 	struct Data {
 		const int idx;
 		int currentIdx;
@@ -223,6 +251,29 @@ int GetIndexOfScene(const OBSWeakCanvas &weakCanvas, const OBSWeakSource &scene)
 		return 0;
 	}
 #endif
 	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
 	// The frontend scene order does not necessarily match the order of the
 	// scenes in the canvas.
 	// So, rely on obs_frontend_get_scenes() in case of the main canvas
 	// instead.
 	if (canvas == mainCanvas) {
 		struct obs_frontend_source_list scenes = {0};
 		obs_frontend_get_scenes(&scenes);
 		OBSSourceAutoRelease sceneSource = OBSGetStrongRef(scene);
 		int idx = 0;
 		for (size_t i = 0; i < scenes.sources.num; i++) {
 			if (scenes.sources.array[i] == sceneSource) {
 				idx = i;
 				break;
 			}
 		}
 		obs_frontend_source_list_free(&scenes);
 		return idx;
 	}
 	struct Data {
 		int idx;
@@ -246,6 +297,12 @@ int GetIndexOfScene(const OBSWeakCanvas &weakCanvas, const OBSWeakSource &scene)
 	return data.idx;
 }
 OBSWeakCanvas GetMainCanvas()
 {
 	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
 	return OBSGetWeakRef(mainCanvas);
 }
 #if LIBOBS_API_VER < MAKE_SEMANTIC_VERSION(31, 1, 0)
 obs_canvas_t *obs_canvas_get_ref(obs_canvas_t *)
--- a/lib/utils/canvas-helpers.hpp
+++ b/lib/utils/canvas-helpers.hpp
@@ -42,6 +42,7 @@ EXPORT OBSWeakSource GetActiveCanvasScene(const OBSWeakCanvas &canvas);
 EXPORT OBSWeakSource GetSceneAtIndex(const OBSWeakCanvas &weakCanvas, int idx);
 EXPORT int GetIndexOfScene(const OBSWeakCanvas &weakCanvas,
 			   const OBSWeakSource &scene);
 EXPORT OBSWeakCanvas GetMainCanvas();
 class CanvasSelection : public FilterComboBox {
 	Q_OBJECT
--- a/lib/utils/math-helpers.cpp
+++ b/lib/utils/math-helpers.cpp
@@ -56,7 +56,7 @@ std::optional<double> GetDouble(const std::string &str)
 std::optional<int> GetInt(const std::string &str)
 {
 	char *end = nullptr;
-	int value = std::strtol(str.c_str(), &end, 10);
+	int value = (int)std::strtol(str.c_str(), &end, 10);
 	if (end != str.c_str() && *end == '\0' && value != INT_MAX &&
 	    value != INT_MIN) {
--- a/lib/utils/resource-table.cpp
+++ b/lib/utils/resource-table.cpp
@@ -8,7 +8,7 @@
 namespace advss {
-ResourceTable::ResourceTable(QTabWidget *parent, const QString &help,
+ResourceTable::ResourceTable(QWidget *parent, const QString &help,
 			     const QString &addToolTip,
 			     const QString &removeToolTip,
 			     const QStringList &headers,
--- a/lib/utils/resource-table.hpp
+++ b/lib/utils/resource-table.hpp
@@ -14,7 +14,7 @@ class ADVSS_EXPORT ResourceTable : public QWidget {
 	Q_OBJECT
 public:
-	ResourceTable(QTabWidget *parent, const QString &help,
+	ResourceTable(QWidget *parent, const QString &help,
 		      const QString &addToolTip, const QString &removeToolTip,
 		      const QStringList &headers,
 		      const std::function<void()> &openSettings);
--- a/lib/utils/scene-selection.cpp
+++ b/lib/utils/scene-selection.cpp
@@ -103,10 +103,11 @@ void SceneSelection::Load(obs_data_t *obj, const char *name,
 	OBSDataAutoRelease data =
 		obs_data_get_obj(obj, selectionSaveName.data());
-	if (obs_data_has_user_value(data, canvasSaveName.data())) {
+	const char *canvasName =
-		_canvas = GetWeakCanvasByName(
+		obs_data_get_string(data, canvasSaveName.data());
-			obs_data_get_string(data, canvasSaveName.data()));
+	_canvas = GetWeakCanvasByName(
-	} else {
+		obs_data_get_string(data, canvasSaveName.data()));
 	if (strcmp(canvasName, "") == 0) {
 		OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
 		_canvas = obs_canvas_get_weak_canvas(mainCanvas);
 		obs_weak_canvas_release(_canvas);
--- a/lib/utils/scene-selection.hpp
+++ b/lib/utils/scene-selection.hpp
@@ -30,7 +30,7 @@ public:
 private:
 	OBSWeakSource _scene;
-	OBSWeakCanvas _canvas;
+	OBSWeakCanvas _canvas = GetMainCanvas();
 	SceneGroup *_group = nullptr;
 	std::weak_ptr<Variable> _variable;
 	Type _type = Type::SCENE;
--- a/lib/utils/ui-helpers.cpp
+++ b/lib/utils/ui-helpers.cpp
@@ -178,7 +178,7 @@ std::string GetThemeTypeName()
 #endif
 }
-void QeueUITask(void (*task)(void *param), void *param)
+void QueueUITask(void (*task)(void *param), void *param)
 {
 	obs_queue_task(OBS_TASK_UI, task, param, false);
 }
--- a/lib/utils/ui-helpers.hpp
+++ b/lib/utils/ui-helpers.hpp
@@ -35,7 +35,7 @@ EXPORT void DisplayTrayMessage(const QString &title, const QString &msg,
 EXPORT std::string GetThemeTypeName();
 EXPORT QWidget *GetSettingsWindow();
-void QeueUITask(void (*task)(void *param), void *param);
+EXPORT void QueueUITask(void (*task)(void *param), void *param);
 bool IsCursorInWidgetArea(QWidget *widget);
--- a/lib/variables/variable-tab.cpp
+++ b/lib/variables/variable-tab.cpp
@@ -8,6 +8,9 @@
 #include "ui-helpers.hpp"
 #include "variable.hpp"
 #include <obs-frontend-api.h>
 #include <QLayout>
 #include <QTimer>
 namespace advss {
@@ -16,14 +19,62 @@ static bool registerTab();
 static void setupTab(QTabWidget *);
 static bool registerTabDone = registerTab();
-static VariableTable *tabWidget = nullptr;
+static VariableTable *dockWidget = nullptr;
 static bool addDock = false;
 static VariableTable::Settings tabSettings;
 static VariableTable::Settings dockSettings;
 static void save(obs_data_t *data)
 {
 	tabSettings.Save(data, "tabSettings");
 	dockSettings.Save(data, "dockSettings");
 	obs_data_set_bool(data, "addVariablesDock", addDock);
 }
 static void enableDock(bool enable)
 {
 	if (OBSIsShuttingDown()) {
 		return;
 	}
 	obs_frontend_remove_dock("advss-variable-dock");
 	addDock = enable;
 	if (!addDock) {
 		return;
 	}
 	dockWidget = new VariableTable(dockSettings);
 	dockWidget->HideDockOptions();
 	if (obs_frontend_add_dock_by_id(
 		    "advss-variable-dock",
 		    obs_module_text("AdvSceneSwitcher.variableTab.title"),
 		    dockWidget)) {
 		return;
 	}
 	blog(LOG_INFO, "failed to register variable dock!");
 	dockWidget->deleteLater();
 	dockWidget = nullptr;
 }
 static void load(obs_data_t *data)
 {
 	tabSettings.Load(data, "tabSettings");
 	dockSettings.Load(data, "dockSettings");
 	enableDock(obs_data_get_bool(data, "addVariablesDock"));
 }
 static bool registerTab()
 {
 	AddPluginInitStep([]() {
-		AddSetupTabCallback("variableTab", VariableTable::Create,
+		AddSetupTabCallback("variableTab",
-				    setupTab);
+				    VariableTable::CreateTabTable, setupTab);
 	});
 	AddSaveStep(save);
 	AddLoadStep(load);
 	return true;
 }
@@ -34,10 +85,14 @@ static void setTabVisible(QTabWidget *tabWidget, bool visible)
 		obs_module_text("AdvSceneSwitcher.variableTab.title"));
 }
-VariableTable *VariableTable::Create()
+VariableTable *VariableTable::CreateTabTable()
 {
-	tabWidget = new VariableTable();
+	return new VariableTable(tabSettings);
-	return tabWidget;
+}
 void VariableTable::HideDockOptions() const
 {
 	_addDock->hide();
 }
 void VariableTable::Add()
@@ -163,15 +218,14 @@ static void updateVariableStatus(QTableWidget *table)
 	}
 }
-static void openSettingsDialog()
+static void openSettingsDialog(VariableTable *table)
 {
-	auto selectedRows =
+	auto selectedRows = table->Table()->selectionModel()->selectedRows();
 		tabWidget->Table()->selectionModel()->selectedRows();
 	if (selectedRows.empty()) {
 		return;
 	}
-	auto cell = tabWidget->Table()->item(selectedRows.last().row(), 0);
+	auto cell = table->Table()->item(selectedRows.last().row(), 0);
 	if (!cell) {
 		return;
 	}
@@ -194,15 +248,14 @@ static void openSettingsDialog()
 void VariableTable::Remove()
 {
-	auto selectedRows =
+	auto selectedRows = Table()->selectionModel()->selectedRows();
 		tabWidget->Table()->selectionModel()->selectedRows();
 	if (selectedRows.empty()) {
 		return;
 	}
 	QStringList varNames;
 	for (const auto &row : selectedRows) {
-		auto cell = tabWidget->Table()->item(row.row(), 0);
+		auto cell = Table()->item(row.row(), 0);
 		if (!cell) {
 			continue;
 		}
@@ -235,7 +288,52 @@ void VariableTable::Remove()
 	}
 }
-VariableTable::VariableTable(QTabWidget *parent)
+void VariableTable::Filter()
 {
 	const auto itemMatches = [&](const QTableWidgetItem *item) {
 		if (!item) {
 			return false;
 		}
 		if (_settings.searchString.empty()) {
 			return true;
 		}
 		const auto text = item->text();
 		if (_settings.regex.Enabled()) {
 			return _settings.regex.Matches(text.toStdString(),
 						       _settings.searchString);
 		}
 		return text.contains(
 			QString::fromStdString(_settings.searchString),
 			Qt::CaseInsensitive);
 	};
 	for (int row = 0; row < Table()->rowCount(); ++row) {
 		bool match = false;
 		if (_settings.searchType == Settings::SearchType::ALL) {
 			for (int col = 0; col < Table()->columnCount(); ++col) {
 				if (itemMatches(Table()->item(row, col))) {
 					match = true;
 					break;
 				}
 			}
 		} else {
 			if (itemMatches(Table()->item(
 				    row,
 				    static_cast<int>(_settings.searchType)))) {
 				match = true;
 			}
 		}
 		Table()->setRowHidden(row, !match);
 	}
 }
 VariableTable::VariableTable(Settings &settings, QWidget *parent)
 	: ResourceTable(
 		  parent, obs_module_text("AdvSceneSwitcher.variableTab.help"),
 		  obs_module_text(
@@ -253,13 +351,113 @@ VariableTable::VariableTable(QTabWidget *parent)
 				     "AdvSceneSwitcher.variableTab.lastUsed.header")
 			  << obs_module_text(
 				     "AdvSceneSwitcher.variableTab.lastChanged.header"),
-		  openSettingsDialog)
+		  [this]() { openSettingsDialog(this); }),
 	  _searchField(new QLineEdit(this)),
 	  _clear(new QPushButton(this)),
 	  _searchType(new QComboBox(this)),
 	  _regexWidget(new RegexConfigWidget(this)),
 	  _addDock(new QCheckBox(
 		  obs_module_text("AdvSceneSwitcher.variableTab.addDock"))),
 	  _settings(settings)
 {
 	_clear->setMaximumWidth(22);
 	SetButtonIcon(_clear, GetThemeTypeName() == "Light"
 				      ? "theme:Light/close.svg"
 				      : "theme:Dark/close.svg");
 	_clear->setToolTip(
 		obs_module_text("AdvSceneSwitcher.variableTab.clear"));
 	_clear->setDisabled(_settings.searchString.empty());
 	connect(_clear, &QPushButton::clicked, this, [this]() {
 		_searchField->setText("");
 		_clear->setDisabled(true);
 	});
 	for (const auto &variable : GetVariables()) {
 		auto v = std::static_pointer_cast<Variable>(variable);
 		AddItemTableRow(Table(), getCellLabels(v.get()));
 	}
 	connect(Table(), &QTableWidget::itemChanged, this,
 		[this]() { Filter(); });
 	_searchField->setPlaceholderText(obs_module_text(
 		("AdvSceneSwitcher.variableTab.search.placeholder")));
 	_searchField->setText(QString::fromStdString(_settings.searchString));
 	connect(_searchField, &QLineEdit::textChanged, this,
 		[this](const QString &text) {
 			_settings.searchString = text.toStdString();
 			_clear->setDisabled(text.isEmpty());
 			Filter();
 		});
 	_searchType->addItem(
 		obs_module_text("AdvSceneSwitcher.variableTab.search.all"),
 		Settings::SearchType::ALL);
 	_searchType->addItem(
 		obs_module_text("AdvSceneSwitcher.variableTab.search.name"),
 		Settings::SearchType::NAME);
 	_searchType->addItem(
 		obs_module_text("AdvSceneSwitcher.variableTab.search.value"),
 		Settings::SearchType::VALUE);
 	_searchType->setCurrentIndex(
 		_searchType->findData(_settings.searchType));
 	connect(_searchType, &QComboBox::currentIndexChanged, this, [this]() {
 		_settings.searchType = static_cast<Settings::SearchType>(
 			_searchType->currentData().toInt());
 	});
 	_regexWidget->SetRegexConfig(_settings.regex);
 	connect(_regexWidget, &RegexConfigWidget::RegexConfigChanged, this,
 		[this](const RegexConfig &regex) {
 			_settings.regex = regex;
 			Filter();
 		});
 	_addDock->setChecked(addDock);
 	connect(_addDock, &QCheckBox::stateChanged, this,
 		[this](int checked) { enableDock(checked); });
 	QWidget::connect(VariableSignalManager::Instance(),
 			 &VariableSignalManager::Rename, this,
 			 [this](const QString &oldName,
 				const QString &newName) {
 				 RenameItemTableRow(Table(), oldName, newName);
 			 });
 	QWidget::connect(
 		VariableSignalManager::Instance(), &VariableSignalManager::Add,
 		this, [this](const QString &name) {
 			AddItemTableRow(
 				Table(),
 				getCellLabels(GetVariableByQString(name)));
 			SetHelpVisible(false);
 			HighlightAddButton(false);
 		});
 	QWidget::connect(VariableSignalManager::Instance(),
 			 &VariableSignalManager::Remove, this,
 			 [this](const QString &name) {
 				 RemoveItemTableRow(Table(), name);
 				 if (Table()->rowCount() == 0) {
 					 SetHelpVisible(true);
 					 HighlightAddButton(true);
 				 }
 			 });
 	auto timer = new QTimer(this);
 	timer->setInterval(1000);
 	QWidget::connect(timer, &QTimer::timeout,
 			 [this]() { updateVariableStatus(Table()); });
 	timer->start();
 	auto searchLayout = new QHBoxLayout();
 	searchLayout->addWidget(_searchField);
 	searchLayout->addWidget(_clear);
 	searchLayout->addWidget(_searchType);
 	searchLayout->addWidget(_regexWidget);
 	searchLayout->addWidget(_addDock);
 	qobject_cast<QVBoxLayout *>(layout())->insertLayout(0, searchLayout);
 	SetHelpVisible(GetVariables().empty());
 }
@@ -270,36 +468,26 @@ static void setupTab(QTabWidget *tab)
 	}
 	QWidget::connect(VariableSignalManager::Instance(),
-			 &VariableSignalManager::Rename, tab,
+			 &VariableSignalManager::Add, tab,
-			 [](const QString &oldName, const QString &newName) {
+			 [tab](const QString &) { setTabVisible(tab, true); });
-				 RenameItemTableRow(tabWidget->Table(), oldName,
+}
 						    newName);
 			 });
 	QWidget::connect(
 		VariableSignalManager::Instance(), &VariableSignalManager::Add,
 		tab, [tab](const QString &name) {
 			AddItemTableRow(
 				tabWidget->Table(),
 				getCellLabels(GetVariableByQString(name)));
 			tabWidget->SetHelpVisible(false);
 			tabWidget->HighlightAddButton(false);
 			setTabVisible(tab, true);
 		});
 	QWidget::connect(VariableSignalManager::Instance(),
 			 &VariableSignalManager::Remove, tab,
 			 [](const QString &name) {
 				 RemoveItemTableRow(tabWidget->Table(), name);
 				 if (tabWidget->Table()->rowCount() == 0) {
 					 tabWidget->SetHelpVisible(true);
 					 tabWidget->HighlightAddButton(true);
 				 }
 			 });
-	auto timer = new QTimer(tabWidget);
+void VariableTable::Settings::Save(obs_data_t *data, const char *name)
-	timer->setInterval(1000);
+{
-	QWidget::connect(timer, &QTimer::timeout,
+	OBSDataAutoRelease settings = obs_data_create();
-			 []() { updateVariableStatus(tabWidget->Table()); });
+	obs_data_set_int(settings, "searchType", static_cast<int>(searchType));
-	timer->start();
+	obs_data_set_string(settings, "searchString", searchString.c_str());
 	regex.Save(settings);
 	obs_data_set_obj(data, name, settings);
 }
 void VariableTable::Settings::Load(obs_data_t *data, const char *name)
 {
 	OBSDataAutoRelease settings = obs_data_get_obj(data, name);
 	searchType = static_cast<SearchType>(
 		obs_data_get_int(settings, "searchType"));
 	searchString = obs_data_get_string(settings, "searchString");
 	regex.Load(settings);
 }
 } // namespace advss
--- a/lib/variables/variable-tab.hpp
+++ b/lib/variables/variable-tab.hpp
@@ -1,5 +1,8 @@
 #pragma once
 #include "resource-table.hpp"
 #include "regex-config.hpp"
 #include <QComboBox>
 namespace advss {
@@ -7,14 +10,34 @@ class VariableTable final : public ResourceTable {
 	Q_OBJECT
 public:
-	static VariableTable *Create();
+	struct Settings {
 		void Save(obs_data_t *data, const char *name);
 		void Load(obs_data_t *data, const char *name);
 		enum SearchType { ALL = -1, NAME = 0, VALUE = 1 };
 		SearchType searchType = SearchType::ALL;
 		std::string searchString;
 		RegexConfig regex;
 	};
 	VariableTable(Settings &settings, QWidget *parent = nullptr);
 	static VariableTable *CreateTabTable();
 	void HideDockOptions() const;
 private slots:
 	void Add();
 	void Remove();
 	void Filter();
 private:
-	VariableTable(QTabWidget *parent = nullptr);
+	QLineEdit *_searchField;
 	QPushButton *_clear;
 	QComboBox *_searchType;
 	RegexConfigWidget *_regexWidget;
 	QCheckBox *_addDock;
 	Settings &_settings;
 };
 } // namespace advss
--- a/lib/variables/variable.cpp
+++ b/lib/variables/variable.cpp
@@ -456,7 +456,7 @@ void ImportVariables(obs_data_t *data)
 	obs_data_array_release(array);
-	QeueUITask(signalImportedVariables, importedVars);
+	QueueUITask(signalImportedVariables, importedVars);
 }
 std::chrono::high_resolution_clock::time_point GetLastVariableChangeTime()
--- a/plugins/base/macro-action-hotkey.cpp
+++ b/plugins/base/macro-action-hotkey.cpp
@@ -601,10 +601,10 @@ static void populateHotkeyNames(QComboBox *list,
 MacroActionHotkeyEdit::MacroActionHotkeyEdit(
 	QWidget *parent, std::shared_ptr<MacroActionHotkey> entryData)
 	: QWidget(parent),
-	  _actionType(new QComboBox()),
+	  _actionType(new FilterComboBox()),
-	  _hotkeyType(new QComboBox()),
+	  _hotkeyType(new FilterComboBox()),
-	  _obsHotkeys(new QComboBox()),
+	  _obsHotkeys(new FilterComboBox()),
-	  _keys(new QComboBox()),
+	  _keys(new FilterComboBox()),
 	  _leftShift(new QCheckBox(
 		  obs_module_text("AdvSceneSwitcher.action.hotkey.leftShift"))),
 	  _rightShift(new QCheckBox(obs_module_text(
--- a/plugins/base/macro-action-hotkey.hpp
+++ b/plugins/base/macro-action-hotkey.hpp
@@ -85,11 +85,14 @@ private slots:
 	void DurationChanged(const Duration &);
 	void OnlySendToOBSChanged(int state);
-protected:
+private:
-	QComboBox *_actionType;
+	void RepopulateOBSHotkeySelection();
-	QComboBox *_hotkeyType;
+	void SetWidgetVisibility();
-	QComboBox *_obsHotkeys;
+
-	QComboBox *_keys;
+	FilterComboBox *_actionType;
 	FilterComboBox *_hotkeyType;
 	FilterComboBox *_obsHotkeys;
 	FilterComboBox *_keys;
 	QCheckBox *_leftShift;
 	QCheckBox *_rightShift;
 	QCheckBox *_leftCtrl;
@@ -101,15 +104,10 @@ protected:
 	DurationSelection *_duration;
 	QCheckBox *_onlySendToOBS;
 	QLabel *_noKeyPressSimulationWarning;
 	std::shared_ptr<MacroActionHotkey> _entryData;
 private:
 	void RepopulateOBSHotkeySelection();
 	void SetWidgetVisibility();
 	QHBoxLayout *_entryLayout;
 	QHBoxLayout *_keyConfigLayout;
 	std::shared_ptr<MacroActionHotkey> _entryData;
 	bool _loading = true;
 };
--- a/plugins/base/macro-action-scene-switch.cpp
+++ b/plugins/base/macro-action-scene-switch.cpp
@@ -137,31 +137,51 @@ bool MacroActionSwitchScene::WaitForTransition(OBSWeakSource &scene,
 bool MacroActionSwitchScene::PerformAction()
 {
 	OBSWeakSource sceneToSwitchTo;
-	OBSWeakCanvas canvas;
+	OBSWeakCanvas canvasToSwitchFor;
 	OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
 	OBSWeakCanvas mainCanvasWeak = OBSGetWeakRef(mainCanvas);
 	const auto getActiveSceneHelper = [this](const OBSWeakCanvas &canvas) {
 		OBSWeakSource activeScene;
 		if (IsMainCanvas(canvas) && _sceneType == SceneType::PREVIEW) {
 			OBSSourceAutoRelease previewSource =
 				obs_frontend_get_current_preview_scene();
 			return OBSGetWeakRef(previewSource);
 		} else {
 			return GetActiveCanvasScene(canvas);
 		}
 	};
 	switch (_action) {
 	case Action::SCENE_NAME:
 		sceneToSwitchTo = _scene.GetScene();
-		canvas = _scene.GetCanvas();
+		canvasToSwitchFor = _scene.GetCanvas();
 		break;
 	case Action::SCENE_LIST_NEXT: {
-		const auto activeScene = GetActiveCanvasScene(_canvas);
+		canvasToSwitchFor = _canvas ? _canvas : mainCanvasWeak;
-		const int currentIndex = GetIndexOfScene(_canvas, activeScene);
+		const auto activeScene =
-		sceneToSwitchTo = GetSceneAtIndex(_canvas, currentIndex + 1);
+			getActiveSceneHelper(canvasToSwitchFor);
-		canvas = _canvas;
+		const int currentIndex =
 			GetIndexOfScene(canvasToSwitchFor, activeScene);
 		sceneToSwitchTo =
 			GetSceneAtIndex(canvasToSwitchFor, currentIndex + 1);
 		break;
 	}
 	case Action::SCENE_LIST_PREVIOUS: {
-		const auto activeScene = GetActiveCanvasScene(_canvas);
+		canvasToSwitchFor = _canvas ? _canvas : mainCanvasWeak;
-		const int currentIndex = GetIndexOfScene(_canvas, activeScene);
+		const auto activeScene =
-		sceneToSwitchTo = GetSceneAtIndex(_canvas, currentIndex - 1);
+			getActiveSceneHelper(canvasToSwitchFor);
-		canvas = _canvas;
+		const int currentIndex =
 			GetIndexOfScene(canvasToSwitchFor, activeScene);
 		sceneToSwitchTo =
 			GetSceneAtIndex(canvasToSwitchFor, currentIndex - 1);
 		break;
 	}
 	case Action::SCENE_LIST_INDEX: {
-		sceneToSwitchTo =
+		canvasToSwitchFor = _canvas ? _canvas : mainCanvasWeak;
-			GetSceneAtIndex(_canvas, _index.GetValue() - 1);
+		sceneToSwitchTo = GetSceneAtIndex(canvasToSwitchFor,
-		canvas = _canvas;
+						  _index.GetValue() - 1);
 		break;
 	}
 	default:
@@ -176,11 +196,12 @@ bool MacroActionSwitchScene::PerformAction()
 	}
 	auto transition = _transition.GetTransition();
-	SwitchScene({sceneToSwitchTo, transition,
+	SwitchScene(
-		     (int)(_duration.Milliseconds())},
+		{sceneToSwitchTo, transition, (int)(_duration.Milliseconds())},
-		    obs_frontend_preview_program_mode_active(), canvas);
+		obs_frontend_preview_program_mode_active(), canvasToSwitchFor);
 	if (_blockUntilTransitionDone && sceneToSwitchTo &&
-	    sceneToSwitchTo != GetCurrentScene() && IsMainCanvas(canvas)) {
+	    sceneToSwitchTo != GetCurrentScene() &&
 	    IsMainCanvas(canvasToSwitchFor)) {
 		return WaitForTransition(sceneToSwitchTo, transition);
 	}
 	return true;
@@ -392,6 +413,7 @@ void MacroActionSwitchSceneEdit::SetWidgetData() const
 	_sceneTypes->setCurrentIndex(_sceneTypes->findData(
 		static_cast<int>(_entryData->_sceneType)));
 	_scenes->SetScene(_entryData->_scene);
 	_canvas->SetCanvas(_entryData->_canvas);
 	_transitions->SetTransition(_entryData->_transition);
 	_duration->SetDuration(_entryData->_duration);
 	_blockUntilTransitionDone->setChecked(
@@ -431,7 +453,7 @@ void MacroActionSwitchSceneEdit::SceneSelectionCanvasChanged(
 	SetWidgetVisibility();
 }
-void MacroActionSwitchSceneEdit::ActionChanged(int value)
+void MacroActionSwitchSceneEdit::ActionChanged(int)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_action = static_cast<MacroActionSwitchScene::Action>(
@@ -561,9 +583,17 @@ void MacroActionSwitchSceneEdit::SetWidgetVisibility()
 		     {{"{{transitions}}", _transitions},
 		      {"{{duration}}", _duration}});
-	const auto canvas = action == MacroActionSwitchScene::Action::SCENE_NAME
+	OBSWeakCanvas canvas;
-				    ? _entryData->_scene.GetCanvas()
+	if (action == MacroActionSwitchScene::Action::SCENE_NAME) {
-				    : _entryData->_canvas;
+		canvas = _entryData->_scene.GetCanvas();
 	} else {
 		if (_entryData->_canvas) {
 			canvas = _entryData->_canvas;
 		} else {
 			OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
 			canvas = OBSGetWeakRef(mainCanvas);
 		}
 	}
 	const bool isMainCanvas = IsMainCanvas(canvas);
 	SetLayoutVisible(_transitionLayout, isMainCanvas);
 	_blockUntilTransitionDone->setVisible(isMainCanvas);
@@ -580,7 +610,7 @@ void MacroActionSwitchSceneEdit::SetWidgetVisibility()
 	_notSupportedWarning->setText(
 		fmt.arg(QString::fromStdString(GetWeakCanvasName(canvas))));
 	_notSupportedWarning->setVisible(
-		!IsMainCanvas(canvas) &&
+		!isMainCanvas &&
 		_entryData->_sceneType ==
 			MacroActionSwitchScene::SceneType::PREVIEW);
--- a/plugins/base/macro-action-source.cpp
+++ b/plugins/base/macro-action-source.cpp
@@ -7,6 +7,8 @@
 #include <obs-frontend-api.h>
 #include <QMainWindow>
 namespace advss {
 const std::string MacroActionSource::id = "source";
@@ -37,6 +39,12 @@ const static std::map<MacroActionSource::Action, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.source.type.openFilterDialog"},
 	{MacroActionSource::Action::OPEN_PROPERTIES_DIALOG,
 	 "AdvSceneSwitcher.action.source.type.openPropertiesDialog"},
 	{MacroActionSource::Action::CLOSE_INTERACTION_DIALOG,
 	 "AdvSceneSwitcher.action.source.type.closeInteractionDialog"},
 	{MacroActionSource::Action::CLOSE_FILTER_DIALOG,
 	 "AdvSceneSwitcher.action.source.type.closeFilterDialog"},
 	{MacroActionSource::Action::CLOSE_PROPERTIES_DIALOG,
 	 "AdvSceneSwitcher.action.source.type.closePropertiesDialog"},
 };
 const static std::map<obs_deinterlace_mode, std::string> deinterlaceModes = {
@@ -108,9 +116,81 @@ static bool isInteractable(obs_source_t *source)
 	return (flags & OBS_SOURCE_INTERACTION) != 0;
 }
 static void closeSourceDialog(obs_source_t *source, bool accept,
 			      const char *className)
 {
 	if (!source) {
 		return;
 	}
 	auto mainWindow =
 		reinterpret_cast<QMainWindow *>(obs_frontend_get_main_window());
 	if (!mainWindow) {
 		return;
 	}
 	for (const auto widget : mainWindow->children()) {
 		auto dialog = qobject_cast<QDialog *>(widget);
 		if (!dialog) {
 			continue;
 		}
 		if (dialog->metaObject()->className() != QString(className)) {
 			continue;
 		}
 		const char *name = obs_source_get_name(source);
 		if (!name) {
 			continue;
 		}
 		if (!dialog->windowTitle().contains(QString(name))) {
 			continue;
 		}
 		if (accept) {
 			dialog->accept();
 			return;
 		}
 		// dialog->reject() will ask for confirmation
 		// Try to avoid this by finding and pressing the cancel button
 		for (const auto widget : dialog->children()) {
 			auto buttons = qobject_cast<QDialogButtonBox *>(widget);
 			if (!buttons) {
 				continue;
 			}
 			for (auto *button : buttons->buttons()) {
 				if (buttons->buttonRole(button) ==
 				    QDialogButtonBox::RejectRole) {
 					button->click();
 					break;
 				}
 			}
 		}
 	}
 }
 template<typename F> void QueueUITaskLambda(F &&func)
 {
 	using FnType = std::decay_t<F>;
 	auto *heapFunc = new FnType(std::forward<F>(func));
 	QueueUITask(
 		[](void *param) {
 			std::unique_ptr<FnType> fn(
 				static_cast<FnType *>(param));
 			(*fn)();
 		},
 		heapFunc);
 }
 bool MacroActionSource::PerformAction()
 {
-	auto s = obs_weak_source_get_source(_source.GetSource());
+	OBSSource s = obs_weak_source_get_source(_source.GetSource());
 	obs_source_release(s);
 	switch (_action) {
 	case Action::ENABLE:
 		obs_source_set_enabled(s, true);
@@ -172,10 +252,31 @@ bool MacroActionSource::PerformAction()
 	case Action::OPEN_PROPERTIES_DIALOG:
 		obs_frontend_open_source_properties(s);
 		break;
 	case Action::CLOSE_INTERACTION_DIALOG:
 		if (!isInteractable(s)) {
 			// Nothing to do
 			break;
 		}
 		QueueUITaskLambda([&]() {
 			closeSourceDialog(s, true, "OBSBasicInteraction");
 		});
 		break;
 	case Action::CLOSE_FILTER_DIALOG:
 		QueueUITaskLambda([&]() {
 			closeSourceDialog(s, _acceptDialog, "OBSBasicFilters");
 		});
 		break;
 	case Action::CLOSE_PROPERTIES_DIALOG:
 		QueueUITaskLambda([&]() {
 			closeSourceDialog(s, _acceptDialog,
 					  "OBSBasicProperties");
 		});
 		break;
 	default:
 		break;
 	}
-	obs_source_release(s);
+
 	return true;
 }
@@ -207,6 +308,7 @@ bool MacroActionSource::Save(obs_data_t *obj) const
 			 static_cast<int>(_deinterlaceMode));
 	obs_data_set_int(obj, "deinterlaceOrder",
 			 static_cast<int>(_deinterlaceOrder));
 	obs_data_set_bool(obj, "acceptDialog", _acceptDialog);
 	return true;
 }
@@ -231,6 +333,7 @@ bool MacroActionSource::Load(obs_data_t *obj)
 		obs_data_get_int(obj, "deinterlaceMode"));
 	_deinterlaceOrder = static_cast<obs_deinterlace_field_order>(
 		obs_data_get_int(obj, "deinterlaceOrder"));
 	_acceptDialog = obs_data_get_bool(obj, "acceptDialog");
 	return true;
 }
@@ -307,7 +410,9 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	  _warning(new QLabel(
 		  obs_module_text("AdvSceneSwitcher.action.source.warning"))),
 	  _refreshSettingSelection(new QPushButton(
-		  obs_module_text("AdvSceneSwitcher.action.source.refresh")))
+		  obs_module_text("AdvSceneSwitcher.action.source.refresh"))),
 	  _acceptDialog(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.action.source.dialog.accept")))
 {
 	populateActionSelection(_actions);
@@ -347,6 +452,8 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 			 SLOT(SelectionChanged(const SourceSetting &)));
 	QWidget::connect(_refreshSettingSelection, SIGNAL(clicked()), this,
 			 SLOT(RefreshVariableSourceSelectionValue()));
 	QWidget::connect(_acceptDialog, SIGNAL(stateChanged(int)), this,
 			 SLOT(AcceptDialogChanged(int)));
 	auto entryLayout = new QHBoxLayout;
 	entryLayout->setContentsMargins(0, 0, 0, 0);
@@ -374,6 +481,7 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	mainLayout->addLayout(_settingsLayout);
 	mainLayout->addWidget(_warning);
 	mainLayout->addWidget(_settingsString);
 	mainLayout->addWidget(_acceptDialog);
 	auto buttonLayout = new QHBoxLayout;
 	buttonLayout->setContentsMargins(0, 0, 0, 0);
 	buttonLayout->addWidget(_getSettings);
@@ -406,6 +514,7 @@ void MacroActionSourceEdit::UpdateEntryData()
 		static_cast<int>(_entryData->_settingsInputMethod)));
 	_tempVars->SetVariable(_entryData->_tempVar);
 	_manualSettingValue->setPlainText(_entryData->_manualSettingValue);
 	_acceptDialog->setChecked(_entryData->_acceptDialog);
 	SetWidgetVisibility();
 }
@@ -531,6 +640,12 @@ void MacroActionSourceEdit::RefreshVariableSourceSelectionValue()
 	_sourceSettings->SetSource(_entryData->_source.GetSource());
 }
 void MacroActionSourceEdit::AcceptDialogChanged(int state)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_acceptDialog = state;
 }
 static QString GetIndividualListEntryName()
 {
 	static const auto matchesInput =
@@ -613,6 +728,12 @@ void MacroActionSourceEdit::SetWidgetVisibility()
 		_entryData->_source.GetType() ==
 			SourceSelection::Type::VARIABLE);
 	_acceptDialog->setVisible(
 		_entryData->_action ==
 			MacroActionSource::Action::CLOSE_FILTER_DIALOG ||
 		_entryData->_action ==
 			MacroActionSource::Action::CLOSE_PROPERTIES_DIALOG);
 	adjustSize();
 	updateGeometry();
 }
--- a/plugins/base/macro-action-source.hpp
+++ b/plugins/base/macro-action-source.hpp
@@ -5,9 +5,10 @@
 #include "source-selection.hpp"
 #include "source-setting.hpp"
 #include <QCheckBox>
 #include <QComboBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QComboBox>
 namespace advss {
@@ -33,6 +34,7 @@ public:
 		OBS_DEINTERLACE_FIELD_ORDER_TOP;
 	TempVariableRef _tempVar;
 	SourceSetting _setting;
 	bool _acceptDialog = false;
 	enum class Action {
 		ENABLE,
@@ -45,6 +47,9 @@ public:
 		OPEN_INTERACTION_DIALOG,
 		OPEN_FILTER_DIALOG,
 		OPEN_PROPERTIES_DIALOG,
 		CLOSE_INTERACTION_DIALOG,
 		CLOSE_FILTER_DIALOG,
 		CLOSE_PROPERTIES_DIALOG,
 	};
 	Action _action = Action::SETTINGS;
@@ -91,6 +96,7 @@ private slots:
 	void SelectionChanged(const SourceSetting &);
 	void ManualSettingsValueChanged();
 	void RefreshVariableSourceSelectionValue();
 	void AcceptDialogChanged(int);
 signals:
 	void HeaderInfoChanged(const QString &);
@@ -112,6 +118,7 @@ private:
 	QComboBox *_deinterlaceOrder;
 	QLabel *_warning;
 	QPushButton *_refreshSettingSelection;
 	QCheckBox *_acceptDialog;
 	std::shared_ptr<MacroActionSource> _entryData;
 	bool _loading = true;
--- a/plugins/base/macro-condition-process.cpp
+++ b/plugins/base/macro-condition-process.cpp
@@ -154,7 +154,7 @@ void MacroConditionProcessEdit::ProcessChanged(const QString &text)
 		QString::fromStdString(_entryData->GetShortDesc()));
 }
-void MacroConditionProcessEdit::showEvent(QShowEvent *event)
+void MacroConditionProcessEdit::showEvent(QShowEvent *)
 {
 	const QSignalBlocker b(_processSelection);
 	const auto text = _processSelection->currentText();
--- a/plugins/base/macro-condition-recording.cpp
+++ b/plugins/base/macro-condition-recording.cpp
@@ -31,6 +31,10 @@ static int currentRecordingDurationInSeconds = 0;
 bool MacroConditionRecord::CheckCondition()
 {
 	char *lastSavePath = obs_frontend_get_last_recording();
 	SetTempVarValue("lastSavePath", lastSavePath ? lastSavePath : "");
 	bfree(lastSavePath);
 	switch (_condition) {
 	case Condition::STOP:
 		return !obs_frontend_recording_active();
@@ -74,6 +78,14 @@ void MacroConditionRecord::SetCondition(Condition condition)
 void MacroConditionRecord::SetupTempVars()
 {
 	MacroCondition::SetupTempVars();
 	AddTempvar(
 		"lastSavePath",
 		obs_module_text(
 			"AdvSceneSwitcher.tempVar.recording.lastSavePath"),
 		obs_module_text(
 			"AdvSceneSwitcher.tempVar.recording.lastSavePath.description"));
 	switch (_condition) {
 	case Condition::DURATION:
 		AddTempvar(
--- a/plugins/base/macro-condition-replay-buffer.cpp
+++ b/plugins/base/macro-condition-replay-buffer.cpp
@@ -58,6 +58,10 @@ bool MacroConditionReplayBuffer::ReplayBufferWasSaved()
 bool MacroConditionReplayBuffer::CheckCondition()
 {
 	char *lastSavePath = obs_frontend_get_last_replay();
 	SetTempVarValue("lastSavePath", lastSavePath ? lastSavePath : "");
 	bfree(lastSavePath);
 	switch (_state) {
 	case Condition::STOP:
 		return !obs_frontend_replay_buffer_active();
@@ -85,6 +89,16 @@ bool MacroConditionReplayBuffer::Load(obs_data_t *obj)
 	return true;
 }
 void MacroConditionReplayBuffer::SetupTempVars()
 {
 	MacroCondition::SetupTempVars();
 	AddTempvar(
 		"lastSavePath",
 		obs_module_text("AdvSceneSwitcher.tempVar.replay.lastSavePath"),
 		obs_module_text(
 			"AdvSceneSwitcher.tempVar.replay.lastSavePath.description"));
 }
 static inline void populateStateSelection(QComboBox *list)
 {
 	for (const auto &entry : conditions) {
--- a/plugins/base/macro-condition-replay-buffer.hpp
+++ b/plugins/base/macro-condition-replay-buffer.hpp
@@ -6,7 +6,7 @@
 namespace advss {
-class MacroConditionReplayBuffer : public MacroCondition {
+class MacroConditionReplayBuffer final : public MacroCondition {
 public:
 	MacroConditionReplayBuffer(Macro *m) : MacroCondition(m) {}
 	bool CheckCondition();
@@ -27,6 +27,7 @@ public:
 	Condition _state = Condition::STOP;
 private:
 	void SetupTempVars();
 	bool ReplayBufferWasSaved();
 	bool _saveTimeInitialized = false;
@@ -35,7 +36,7 @@ private:
 	static const std::string id;
 };
-class MacroConditionReplayBufferEdit : public QWidget {
+class MacroConditionReplayBufferEdit final : public QWidget {
 	Q_OBJECT
 public:
@@ -55,11 +56,10 @@ public:
 private slots:
 	void StateChanged(int value);
 protected:
 	QComboBox *_state;
 	std::shared_ptr<MacroConditionReplayBuffer> _entryData;
 private:
 	QComboBox *_state;
 	std::shared_ptr<MacroConditionReplayBuffer> _entryData;
 	bool _loading = true;
 };
--- a/plugins/twitch/token.cpp
+++ b/plugins/twitch/token.cpp
@@ -1,6 +1,7 @@
 #include "token.hpp"
 #include "twitch-helpers.hpp"
 #include <help-icon.hpp>
 #include <layout-helpers.hpp>
 #include <log-helper.hpp>
 #include <obs-module-helper.hpp>
@@ -163,7 +164,8 @@ TwitchToken::TwitchToken(const TwitchToken &other)
 	  _userID(other._userID),
 	  _tokenOptions(other._tokenOptions),
 	  _eventSub(),
-	  _validateEventSubTimestamps(other._validateEventSubTimestamps)
+	  _validateEventSubTimestamps(other._validateEventSubTimestamps),
 	  _warnIfInvalid(other._warnIfInvalid)
 {
 }
@@ -174,6 +176,7 @@ TwitchToken &TwitchToken::operator=(const TwitchToken &other)
 	_userID = other._userID;
 	_tokenOptions = other._tokenOptions;
 	_validateEventSubTimestamps = other._validateEventSubTimestamps;
 	_warnIfInvalid = other._warnIfInvalid;
 	return *this;
 }
@@ -185,6 +188,9 @@ void TwitchToken::Load(obs_data_t *obj)
 	obs_data_set_default_bool(obj, "validateEventSubTimestamps", true);
 	_validateEventSubTimestamps =
 		obs_data_get_bool(obj, "validateEventSubTimestamps");
 	_warnIfInvalid = obs_data_has_user_value(obj, "warnIfInvalid")
 				 ? obs_data_get_bool(obj, "warnIfInvalid")
 				 : true;
 	_tokenOptions.clear();
 	OBSDataArrayAutoRelease options = obs_data_get_array(obj, "options");
 	size_t count = obs_data_array_count(options);
@@ -203,6 +209,7 @@ void TwitchToken::Save(obs_data_t *obj) const
 	obs_data_set_string(obj, "userID", _userID.c_str());
 	obs_data_set_bool(obj, "validateEventSubTimestamps",
 			  _validateEventSubTimestamps);
 	obs_data_set_bool(obj, "warnIfInvalid", _warnIfInvalid);
 	OBSDataArrayAutoRelease options = obs_data_array_create();
 	for (auto &option : _tokenOptions) {
 		OBSDataAutoRelease arrayObj = obs_data_create();
@@ -477,7 +484,9 @@ TwitchTokenSettingsDialog::TwitchTokenSettingsDialog(
 	  _tokenStatus(new QLabel()),
 	  _generalSettingsGrid(new QGridLayout()),
 	  _validateTimestamps(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.twitchToken.validateTimestamps")))
+		  "AdvSceneSwitcher.twitchToken.validateTimestamps"))),
 	  _warnIfInvalid(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.twitchToken.warnIfInvalid")))
 {
 	_showToken->setMaximumWidth(22);
 	_showToken->setFlat(true);
@@ -539,11 +548,18 @@ TwitchTokenSettingsDialog::TwitchTokenSettingsDialog(
 	scrollArea->setWidgetResizable(true);
 	scrollArea->setFrameShape(QFrame::NoFrame);
 	auto timestampsLayout = new QHBoxLayout();
 	timestampsLayout->addWidget(_validateTimestamps);
 	auto timestampHelp = new HelpIcon(obs_module_text(
 		"AdvSceneSwitcher.twitchToken.validateTimestamps.tooltip"));
 	timestampsLayout->addWidget(timestampHelp);
 	auto contentWidget = new QWidget(scrollArea);
 	auto layout = new QVBoxLayout(contentWidget);
 	layout->addLayout(_generalSettingsGrid);
 	layout->addWidget(optionsBox);
-	layout->addWidget(_validateTimestamps);
+	layout->addLayout(timestampsLayout);
 	layout->addWidget(_warnIfInvalid);
 	layout->setContentsMargins(0, 0, 0, 0);
 	scrollArea->setWidget(contentWidget);
@@ -569,6 +585,7 @@ TwitchTokenSettingsDialog::TwitchTokenSettingsDialog(
 #ifndef VERIFY_TIMESTAMPS
 	_validateTimestamps->hide();
 #endif
 	_warnIfInvalid->setChecked(settings._warnIfInvalid);
 	_currentToken = settings;
@@ -777,6 +794,8 @@ bool TwitchTokenSettingsDialog::AskForSettings(QWidget *parent,
 	settings._tokenOptions = dialog.GetEnabledOptions();
 	settings._validateEventSubTimestamps =
 		dialog._validateTimestamps->isChecked();
 	settings._warnIfInvalid = dialog._warnIfInvalid->isChecked();
 	if (settings._eventSub) {
 		settings._eventSub->EnableTimestampValidation(
 			settings._validateEventSubTimestamps);
--- a/plugins/twitch/token.hpp
+++ b/plugins/twitch/token.hpp
@@ -55,6 +55,8 @@ public:
 	std::shared_ptr<EventSub> GetEventSub();
 	bool ValidateTimestamps() const { return _validateEventSubTimestamps; }
 	bool IsValid(bool forceUpdate = false) const;
 	bool WarnIfInvalid() const { return _warnIfInvalid; }
 	void SetWarnIfInvalid(bool value) { _warnIfInvalid = value; }
 	size_t PermissionCount() const { return _tokenOptions.size(); }
 private:
@@ -67,6 +69,7 @@ private:
 	std::set<TokenOption> _tokenOptions = TokenOption::GetAllTokenOptions();
 	std::shared_ptr<EventSub> _eventSub;
 	bool _validateEventSubTimestamps = false;
 	bool _warnIfInvalid = true;
 	static bool _setup;
@@ -131,6 +134,7 @@ private:
 	TwitchToken _currentToken;
 	std::unordered_map<std::string, QCheckBox *> _optionWidgets;
 	QCheckBox *_validateTimestamps;
 	QCheckBox *_warnIfInvalid;
 	QTimer _validationTimer;
 };
--- a/plugins/twitch/twitch-helpers.cpp
+++ b/plugins/twitch/twitch-helpers.cpp
@@ -144,9 +144,14 @@ static void handleThrottling(const httplib::Result &response)
 		return;
 	}
-	blog(LOG_WARNING, "Twitch API access is throttled for %lld seconds!",
+	if (sleepDuration < std::chrono::seconds(1)) {
 		sleepDuration = std::chrono::seconds(1);
 	}
 	blog(LOG_WARNING,
 	     "Twitch API access is throttled for %lld milliseconds!",
 	     static_cast<long long int>(
-		     std::chrono::duration_cast<std::chrono::seconds>(
+		     std::chrono::duration_cast<std::chrono::milliseconds>(
 			     sleepDuration)
 			     .count()));
 	apiIsThrottling = true;
--- a/plugins/twitch/twitch-tab.cpp
+++ b/plugins/twitch/twitch-tab.cpp
@@ -1,24 +1,47 @@
 #include "twitch-tab.hpp"
 #include "obs-module-helper.hpp"
 #include "plugin-state-helpers.hpp"
 #include "sync-helpers.hpp"
 #include "tab-helpers.hpp"
 #include "token.hpp"
 #include "ui-helpers.hpp"
 #include <QDialogButtonBox>
 #include <QTabWidget>
 namespace advss {
-static bool registerTab();
+static bool setup();
 static void setupTab(QTabWidget *);
-static bool registerTabDone = registerTab();
+static bool setupDone = setup();
 static TwitchConnectionsTable *tabWidget = nullptr;
-static bool registerTab()
+static QStringList getInvalidTokens();
 static bool setup()
 {
 	AddSetupTabCallback("twitchConnectionTab",
 			    TwitchConnectionsTable::Create, setupTab);
 	static const auto showInvalidWarnings = []() {
 		const auto invalidTokens = getInvalidTokens();
 		for (const auto &token : invalidTokens) {
 			QueueUITask(
 				[](void *tokenPtr) {
 					auto tokenName = static_cast<QString *>(
 						tokenPtr);
 					InvalidTokenDialog::ShowWarning(
 						*tokenName);
 				},
 				(void *)&token);
 		}
 	};
 	AddLoadStep([](obs_data_t *) {
 		AddPostLoadStep([]() { showInvalidWarnings(); });
 	});
 	return true;
 }
@@ -188,6 +211,25 @@ static void updateConnectionStatus(QTableWidget *table)
 	}
 }
 static QStringList getInvalidTokens()
 {
 	QStringList tokens;
 	for (const auto &t : GetTwitchTokens()) {
 		if (!t) {
 			continue;
 		}
 		auto token = std::static_pointer_cast<TwitchToken>(t);
 		if (!token->WarnIfInvalid() || token->IsValid(true)) {
 			continue;
 		}
 		tokens << QString::fromStdString(token->GetName());
 	}
 	return tokens;
 }
 static void setupTab(QTabWidget *tab)
 {
 	if (GetTwitchTokens().empty()) {
@@ -222,6 +264,63 @@ static void setupTab(QTabWidget *tab)
 			updateConnectionStatus(tabWidget->Table());
 		}
 	});
 	const auto invalidTokens = getInvalidTokens();
 	for (const auto &token : invalidTokens) {
 		// Constructing the warning dialog in the constructor of the settings
 		// window might lead to a crash, so wait for the settings window
 		// constructor to complete
 		QTimer::singleShot(0, tab, [token]() {
 			InvalidTokenDialog::ShowWarning(token);
 		});
 	}
 }
 void InvalidTokenDialog::ShowWarning(const QString &tokenName)
 {
 	auto weakToken = GetWeakTwitchTokenByQString(tokenName);
 	auto token = weakToken.lock();
 	if (!token) {
 		return;
 	}
 	auto dialog = new InvalidTokenDialog(tokenName);
 	dialog->setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle"));
 	const bool ignore = dialog->exec() != DialogCode::Accepted;
 	token->SetWarnIfInvalid(!dialog->_doNotShowAgain->isChecked());
 	dialog->deleteLater();
 	if (ignore) {
 		return;
 	}
 	TwitchTokenSettingsDialog::AskForSettings(GetSettingsWindow(),
 						  *token.get());
 }
 InvalidTokenDialog::InvalidTokenDialog(const QString &name)
 	: QDialog(GetSettingsWindow()),
 	  _doNotShowAgain(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.twitchToken.warnIfInvalid.doNotShowAgain")))
 {
 	auto buttons = new QDialogButtonBox(QDialogButtonBox::Ignore |
 					    QDialogButtonBox::Open);
 	connect(buttons->button(QDialogButtonBox::Ignore),
 		&QPushButton::clicked, this, &QDialog::reject);
 	connect(buttons->button(QDialogButtonBox::Open), &QPushButton::clicked,
 		this, &QDialog::accept);
 	buttons->setCenterButtons(true);
 	const QString format(obs_module_text(
 		"AdvSceneSwitcher.twitchToken.warnIfInvalid.message"));
 	const QString message = format.arg(name);
 	auto layout = new QVBoxLayout;
 	layout->addWidget(new QLabel(message));
 	layout->addWidget(_doNotShowAgain);
 	layout->addWidget(buttons);
 	setLayout(layout);
 }
 } // namespace advss
--- a/plugins/twitch/twitch-tab.hpp
+++ b/plugins/twitch/twitch-tab.hpp
@@ -1,6 +1,9 @@
 #pragma once
 #include "resource-table.hpp"
 #include <QCheckBox>
 #include <QDialog>
 namespace advss {
 class TwitchConnectionsTable final : public ResourceTable {
@@ -17,4 +20,14 @@ private:
 	TwitchConnectionsTable(QTabWidget *parent = nullptr);
 };
 class InvalidTokenDialog : public QDialog {
 	Q_OBJECT
 public:
 	static void ShowWarning(const QString &name);
 private:
 	InvalidTokenDialog(const QString &name);
 	QCheckBox *_doNotShowAgain;
 };
 } // namespace advss
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -106,8 +106,11 @@ target_sources(
 # --- variable --- #
-if(NOT OS_WINDOWS)
+if(OS_WINDOWS)
-  target_compile_options(${PROJECT_NAME} PUBLIC -Wno-error=shadow)
+  target_compile_options(${PROJECT_NAME} PRIVATE /wd4100)
 else()
  target_compile_options(${PROJECT_NAME} PRIVATE -Wno-error=shadow
                                                 -Wno-unused-parameter)
 endif()
 target_sources(
--- a/tests/mocks/ui-helpers.cpp
+++ b/tests/mocks/ui-helpers.cpp
@@ -40,7 +40,7 @@ std::string GetThemeTypeName()
 	return "Dark";
 }
-void QeueUITask(void (*task)(void *param), void *) {}
+void QueueUITask(void (*task)(void *param), void *) {}
 QWidget *GetSettingsWindow()
 {
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
WarmUpTill	de20c93b14	Rearrange layout of "General" tab Some checks failed debian-build / build (push) Has been cancelled Details Check locale / ubuntu64 (push) Has been cancelled Details Push to master / Check Formatting 🔍 (push) Has been cancelled Details Push to master / Build Project 🧱 (push) Has been cancelled Details Push to master / Create Release 🛫 (push) Has been cancelled Details	2025-12-06 19:27:54 +01:00
WarmUpTill	b0d877db8c	Cleanup unnecessary nested layouts	2025-12-06 19:27:54 +01:00
WarmUpTill	caf9e59475	Remove option to disable widget caching Option was only introduced in case instabilities arise. However, there weren't any reports of issues for a long time.	2025-12-06 19:27:54 +01:00
WarmUpTill	5f6982b5bb	Add macro search functionality Allows search by ... * Macro name * Segment type * Segment label	2025-12-06 19:27:54 +01:00
WarmUpTill	ce399cc647	Move functions	2025-12-06 19:27:54 +01:00
WarmUpTill	03f67534c7	Default to main canvas in scene selection Some checks are pending debian-build / build (push) Waiting to run Details Check locale / ubuntu64 (push) Waiting to run Details Push to master / Check Formatting 🔍 (push) Waiting to run Details Push to master / Build Project 🧱 (push) Waiting to run Details Push to master / Create Release 🛫 (push) Blocked by required conditions Details New scene selections would have no canvas selected at all. This would cause issues in places which do not support an empty canvas selection. For example, the "scene changed" check of the scene condition would not work as without any canvas it is not clear which scene to check for.	2025-12-05 17:30:16 +01:00
WarmUpTill	246667e65e	Fix scene list scene switches not working * Assume default canvas to be main canvas * Add proper handling for the preview scene for next / previous * Only display canvas warning if a canvas was selected * Fix canvas selection not showing backend value	2025-12-05 17:30:16 +01:00
WarmUpTill	68fe7716e7	Add special handling for main canvas	2025-12-05 17:30:16 +01:00
WarmUpTill	98cc710b4a	Add tooltip to "verify timestamps" option	2025-12-05 17:30:16 +01:00
WarmUpTill	c602c30c54	Display warning if Twitch token expired or is invalid	2025-12-05 17:30:16 +01:00
WarmUpTill	cc1b89fe1d	Fix crash on macro tab setup	2025-12-05 17:30:16 +01:00
WarmUpTill	1de4ef7ec2	Add retry mechanism for downloading dependencies	2025-12-05 17:30:16 +01:00
WarmUpTill	e29060fdea	Throttle Twitch API access for at least 1 second Some checks failed debian-build / build (push) Has been cancelled Details Push to master / Check Formatting 🔍 (push) Has been cancelled Details Push to master / Build Project 🧱 (push) Has been cancelled Details Push to master / Create Release 🛫 (push) Has been cancelled Details	2025-12-03 18:30:17 +01:00
WarmUpTill	a0e6e6f528	Add options to close source dialogs Some checks failed debian-build / build (push) Has been cancelled Details Check locale / ubuntu64 (push) Has been cancelled Details Push to master / Check Formatting 🔍 (push) Has been cancelled Details Push to master / Build Project 🧱 (push) Has been cancelled Details Push to master / Create Release 🛫 (push) Has been cancelled Details	2025-11-14 13:56:03 +01:00
WarmUpTill	e30d5845fa	Run macro via dock button in parallel and ignore pause	2025-11-14 13:56:03 +01:00
WarmUpTill	d12911cd02	Fix typo	2025-11-14 13:56:03 +01:00
WarmUpTill	b8ecc40e8c	Add search clear button to the variable tab	2025-11-14 12:38:24 +01:00
WarmUpTill	8ec4849b1d	Add option copy value of another variable	2025-11-14 12:38:24 +01:00
WarmUpTill	e6e9f3a831	Add temp var for last replay buffer save path Some checks are pending debian-build / build (push) Waiting to run Details Check locale / ubuntu64 (push) Waiting to run Details Push to master / Check Formatting 🔍 (push) Waiting to run Details Push to master / Build Project 🧱 (push) Waiting to run Details Push to master / Create Release 🛫 (push) Blocked by required conditions Details	2025-11-13 21:06:29 +01:00
WarmUpTill	555f7c1381	Add option to enable dock containing variable tab Some checks failed debian-build / build (push) Has been cancelled Details Check locale / ubuntu64 (push) Has been cancelled Details Push to master / Check Formatting 🔍 (push) Has been cancelled Details Push to master / Build Project 🧱 (push) Has been cancelled Details Push to master / Create Release 🛫 (push) Has been cancelled Details	2025-11-10 18:45:06 +01:00
WarmUpTill	f0f8b0fd92	Add option to search in variable tab	2025-11-10 18:45:06 +01:00
WarmUpTill	661e83162f	Cleanup	2025-11-10 18:45:06 +01:00
WarmUpTill	4606f80a9d	Enable filtering in "Hotkey" action	2025-11-10 18:45:06 +01:00