Restore to user configured output name after probing
This commit is contained in:
@@ -161,8 +161,13 @@ namespace proc {
|
|||||||
// Ensure starting from a clean slate
|
// Ensure starting from a clean slate
|
||||||
terminate();
|
terminate();
|
||||||
|
|
||||||
|
// Save the original output name in case we modify it temporary later
|
||||||
|
std::string output_name_orig = config::video.output_name;
|
||||||
|
|
||||||
// Executed when returning from function
|
// Executed when returning from function
|
||||||
auto fg = util::fail_guard([&]() {
|
auto fg = util::fail_guard([&]() {
|
||||||
|
// Restore to user defined output name
|
||||||
|
config::video.output_name = output_name_orig;
|
||||||
terminate();
|
terminate();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -442,6 +447,9 @@ namespace proc {
|
|||||||
|
|
||||||
fg.disable();
|
fg.disable();
|
||||||
|
|
||||||
|
// Restore to user defined output name
|
||||||
|
config::video.output_name = output_name_orig;
|
||||||
|
|
||||||
#if defined SUNSHINE_TRAY && SUNSHINE_TRAY >= 1
|
#if defined SUNSHINE_TRAY && SUNSHINE_TRAY >= 1
|
||||||
system_tray::update_tray_playing(_app.name);
|
system_tray::update_tray_playing(_app.name);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user