Merge remote-tracking branch 'origin/dev'

v4u6h4n · May 25, 2024 · 1e0e6ad · 1e0e6ad
2 parents 85a90aa + d0d6544
commit 1e0e6ad
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/configurator.sh b/configurator.sh
@@ -4273,12 +4273,19 @@ interpret_source_permission() {
             }
             setting_update_pipeware_restart() {
 
+                setting_update_system_obs_stream_stop unrestricted
+                setting_update_system_obs_stream_stop unrestricted_uncut
+
+                sleep 0.5
+
                 command system application obs_studio all stop
 
+                sleep 1
+
                 echo_info "Restarting pipewire..."
                 systemctl --user restart pipewire
 
-                sleep 0.5
+                sleep 1
 
                 killall -e xdg-desktop-portal-hyprland
                 killall -e xdg-desktop-portal-wlr
@@ -4292,19 +4299,23 @@ interpret_source_permission() {
                 echo_info "Restarting portal..."
                 /usr/lib/xdg-desktop-portal & disown
 
-                setting_update_output_device_create_null_sink_1
-
                 sleep 1
 
-                command output reset
-
                 command system application obs_studio unrestricted_uncut start
                 sleep 0.5
                 command system application obs_studio unrestricted start
                 sleep 0.5
                 command system application obs_studio restricted_uncut start
                 sleep 0.5
                 command system application obs_studio restricted start
+
+                sleep 1
+
+                setting_update_output_device_create_null_sink_1
+
+                sleep 5
+
+                command output reset
 
                 espeak "Restart complete."
 
@@ -4386,6 +4397,11 @@ interpret_source_permission() {
                 fi
 
             }
+            setting_update_system_obs_stream_status() {
+
+                operation_socket --client $1 stream status
+
+            }
 
         # Scene.
         setting_update_scene() {