Fix macro video condition save

Logic, collapsed state and time constraint were not saved for video condition.
Add note to network tab
2026-08-29 04:36:21 -05:00 · 2021-07-24 23:47:24 -07:00 · 2021-07-24 23:31:35 -07:00
3 changed files with 9 additions and 0 deletions
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -457,6 +457,7 @@ AdvSceneSwitcher.videoTab.help="<html><head/><body><p>This tab will allow you to

 ; Network Tab
 AdvSceneSwitcher.networkTab.title="Network"
+AdvSceneSwitcher.networkTab.description="This tab will allow you to remotely control the active scene of another OBS instance.\nPlease note that the scene names have to match exactly on all OBS instances."
 AdvSceneSwitcher.networkTab.warning="Running the server outside of a local network will allow third parties to read the active scene."
 AdvSceneSwitcher.networkTab.DisabledWarning="This functionality unfortunately had to be disabled on macOS due to library incompatibilities when running the obs-websocket plugin in parallel."
 AdvSceneSwitcher.networkTab.server="Start server (Sends scene switch messages to all connected clients)"
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -3716,6 +3716,13 @@
       <string>AdvSceneSwitcher.networkTab.title</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout_30">
+       <item>
+        <widget class="QLabel" name="networkTabDescription">
+         <property name="text">
+          <string>AdvSceneSwitcher.networkTab.description</string>
+         </property>
+        </widget>
+       </item>
       <item>
        <widget class="QLabel" name="networkTabWarningLabel">
         <property name="text">
--- a/src/macro-condition-video.cpp
+++ b/src/macro-condition-video.cpp
@@ -64,6 +64,7 @@ bool MacroConditionVideo::Save(obs_data_t *obj)

 bool MacroConditionVideo::Load(obs_data_t *obj)
 {
+	MacroCondition::Load(obj);
 	const char *videoSourceName = obs_data_get_string(obj, "videoSource");
 	_videoSource = GetWeakSourceByName(videoSourceName);
 	_condition =
Author	SHA1	Message	Date
WarmUpTill	99c9b1a4a2	Fix macro video condition save Logic, collapsed state and time constraint were not saved for video condition.	2021-07-24 23:47:24 -07:00
WarmUpTill	8c0aad4c96	Add note to network tab The requirement of the scene names having to match extactly was not made clear and caused some confusion.	2021-07-24 23:31:35 -07:00