jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frontend-tools: Free xdisplay on Linux auto scene switcher

Browse Source 
The xdisplay in the Linux scene switcher was never closed
when OBS exits.
This commit is contained in:
Clayton Groeneveld 2020-09-20 12:39:35 -05:00
parent e9a0b41795
commit 13d43e9782
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/frontend-plugins/frontend-tools/auto-scene-switcher-nix.cpp
View File

@ -27,7 +27,7 @@ Display *disp()
return xdisplay;
}
void cleanupDisplay()
void CleanupSceneSwitcher()
{
if (!xdisplay)
return;

2
UI/frontend-plugins/frontend-tools/auto-scene-switcher-osx.mm
View File

@ -41,3 +41,5 @@ void GetCurrentWindowTitle(string &title)
}
}
}
void CleanupSceneSwitcher() {}

2
UI/frontend-plugins/frontend-tools/auto-scene-switcher-win.cpp
View File

@ -67,3 +67,5 @@ void GetCurrentWindowTitle(string &title)
}
GetWindowTitle(window, title);
}
void CleanupSceneSwitcher() {}

2
UI/frontend-plugins/frontend-tools/auto-scene-switcher.cpp
View File

@ -521,6 +521,8 @@ void SwitcherData::Stop()
extern "C" void FreeSceneSwitcher()
{
CleanupSceneSwitcher();
delete switcher;
switcher = nullptr;
}

1
UI/frontend-plugins/frontend-tools/auto-scene-switcher.hpp
View File

@ -45,3 +45,4 @@ public slots:
void GetWindowList(std::vector<std::string> &windows);
void GetCurrentWindowTitle(std::string &title);
void CleanupSceneSwitcher();