Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

scene round trip crash fix

Browse Source
This commit is contained in:
WarmUpTill 2016-11-07 21:16:18 +01:00 committed by GitHub
parent 9ff9757009
commit dbdbfda339
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
advanced-scene-switcher.cpp
View File

@ -601,6 +601,7 @@ void SceneSwitcher::on_switches_currentRowChanged(int idx)
ui->scenes->setCurrentText(name.c_str());
ui->windows->setCurrentText(window);
ui->transitions->setCurrentText(transitionName.c_str());
ui->fullscreenCheckBox->setChecked(s.fullscreen);
break;
}
}
@ -1388,7 +1389,7 @@ void SceneSwitcher::on_toggleStartButton_clicked()
void SceneSwitcher::updateScreenRegionCursorPos(){
pair<int,int>position = getCursorPos();
ui->cursorXPosition->setText(QString::number(position.first));
ui->cursorXPosition->setText(QString::number(position.first));;
ui->cursorYPosition->setText(QString::number(position.second));
}
@ -1827,12 +1828,20 @@ void SwitcherData::Thread()
}
cv.wait_for(lock, duration);
threadEndMutex.lock();
if (stop) {
threadEndMutex.unlock();
break;
{
lock_guard<mutex> lock(threadEndMutex);
if (stop) {
obs_source_release(currentSource);
break;
}
}
else threadEndMutex.unlock();
//threadEndMutex.lock();
//if (stop) {
// threadEndMutex.unlock();
// break;
//}
//else threadEndMutex.unlock();
if (fileIO.readEnabled){
QFile file(QString::fromStdString(fileIO.readPath));
@ -1857,7 +1866,6 @@ void SwitcherData::Thread()
OBSWeakSource ws = obs_source_get_weak_source(currentSource);
if (autoStopScene == ws) {
//stop
if (obs_frontend_streaming_active())
obs_frontend_streaming_stop();
if (obs_frontend_recording_active())
@ -1930,6 +1938,7 @@ void SwitcherData::Thread()
obs_source_t *currentSource2 =
obs_frontend_get_current_scene();
//don't switch if user changed scene manually
if (currentSource == currentSource2){
obs_source_t *transition;
OBSWeakSource transitionWs = getNextTransition(s.scene1, s.scene2);