From 9b40c417a2839f1ce7320836c0ca7159418298d2 Mon Sep 17 00:00:00 2001
From: Green Sky <Green-Sky@users.noreply.github.com>
Date: Fri, 4 Apr 2025 14:33:05 +0200
Subject: [PATCH] fix sdl camera destruction order

---
 src/main_screen.cpp | 4 ++--
 src/main_screen.hpp | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main_screen.cpp b/src/main_screen.cpp
index 6812590..c5c480a 100644
--- a/src/main_screen.cpp
+++ b/src/main_screen.cpp
@@ -39,6 +39,7 @@ MainScreen::MainScreen(const SimpleConfigModel& conf_, SDL_Renderer* renderer_,
 	rmm(cs),
 	msnj{cs, os, {}, {}},
 	mts(rmm),
+	sdlvis(os),
 	sm(os),
 	tc(conf, save_path, save_password),
 	tel(tc, std::cout),
@@ -69,8 +70,7 @@ MainScreen::MainScreen(const SimpleConfigModel& conf_, SDL_Renderer* renderer_,
 	tdch(tpi),
 	tnui(tpi),
 	smui(os, sm),
-	dvt(os, sm, sdlrtu),
-	sdlvis(os)
+	dvt(os, sm, sdlrtu)
 {
 	tel.subscribeAll();
 
diff --git a/src/main_screen.hpp b/src/main_screen.hpp
index 5599c0b..ea1d2da 100644
--- a/src/main_screen.hpp
+++ b/src/main_screen.hpp
@@ -37,6 +37,7 @@
 #include "./tox_dht_cap_histo.hpp"
 #include "./tox_netprof_ui.hpp"
 #include "./tox_friend_faux_offline_messaging.hpp"
+#include "./frame_streams/sdl/sdl_video_input_service.hpp"
 #include "./stream_manager_ui.hpp"
 #include "./debug_video_tap.hpp"
 
@@ -45,8 +46,6 @@
 #include "./tox_av_voip_model.hpp"
 #endif
 
-#include "./frame_streams/sdl/sdl_video_input_service.hpp"
-
 #include <string>
 #include <iostream>
 #include <chrono>
@@ -67,6 +66,7 @@ struct MainScreen final : public Screen {
 	MessageSerializerNJ msnj;
 	MessageTimeSort mts;
 
+	SDLVideoInputService sdlvis; // sm ends the threads and closes the devices
 	StreamManager sm;
 
 	ToxClient tc;
@@ -105,7 +105,6 @@ struct MainScreen final : public Screen {
 	ToxNetprofUI tnui;
 	StreamManagerUI smui;
 	DebugVideoTap dvt;
-	SDLVideoInputService sdlvis;
 
 	PluginManager pm; // last, so it gets destroyed first