Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-03 07:45:50 -05:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix for freeze when using pausehotkey during Round Trip

Browse Source
This commit is contained in:
WarmUpTill 2016-08-26 16:30:53 +02:00 committed by GitHub
parent 7e2540dd22
commit 2ed2ff3de3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
switcher.cpp
View File

@ -26,7 +26,6 @@ void Switcher::switcherThreadFunc() {
bool checkFullscreen = false;
bool pauseSwitching = false;
size_t sleepTime = 1000;
auto locked = unique_lock<mutex>(mtx);
while (isRunning) {
//get Scene Name
obs_source_t * transitionUsed = obs_get_output_source(0);
@ -184,6 +183,7 @@ void Switcher::switcherThreadFunc() {
}
}
//sleep for a bit
auto locked = unique_lock<mutex>(mtx);
terminate.wait_for(locked, chrono::milliseconds(sleepTime));
//this_thread::sleep_for(chrono::milliseconds(sleepTime));
sleepTime = 1000;
@ -280,8 +280,7 @@ void Switcher::load() {
//start thread
void Switcher::start()
{
auto locked = unique_lock<mutex>(mtx);
{
isRunning = true;
switcherThread = thread(&Switcher::switcherThreadFunc, this);
}
@ -389,8 +388,8 @@ string Switcher::GetActiveWindowTitle()
//tell the thread to stop
void Switcher::stop() {
auto locked = unique_lock<mutex>(mtx);
isRunning = false;
terminate.notify_one();
if (switcherThread.joinable()) switcherThread.join();
}

1
switcher.h
View File

@ -1,6 +1,7 @@
#pragma once
#include "settings.h"
#include <map>
#include <mutex>
#include <vector>
#include <thread>