Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-23 18:35:01 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix of crash on first use of plugin

Browse Source
This commit is contained in:
WarmUpTill 2017-10-29 00:28:47 +02:00 committed by GitHub
parent d807127bca
commit ff013b477c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
advanced-scene-switcher.cpp
View File

@ -24,20 +24,7 @@
#include "utility.hpp"
#include "advanced-scene-switcher.hpp"
#if 1
#include <Windows.h>
static std::wstring s2ws(const std::string& s)
{
int len;
int slength = (int)s.length() + 1;
len = MultiByteToWideChar(CP_ACP, 0, s.c_str(), slength, 0, 0);
wchar_t* buf = new wchar_t[len];
MultiByteToWideChar(CP_ACP, 0, s.c_str(), slength, buf, len);
std::wstring r(buf);
delete[] buf;
return r;
}
#endif
using namespace std;
SwitcherData* switcher = nullptr;
@ -88,6 +75,8 @@ SceneSwitcher::SceneSwitcher(QWidget* parent)
obs_frontend_source_list_free(transitions);
if (switcher->switchIfNotMatching)
ui->noMatchSwitch->setChecked(true);
else
@ -196,7 +185,7 @@ SceneSwitcher::SceneSwitcher(QWidget* parent)
if (s.delay * 1000 < smallestDelay)
smallestDelay = s.delay * 1000;
}
(smallestDelay < switcher->interval) ? ui->intervalWarning->setVisible(true) : ui->intervalWarning->setVisible(false);
(smallestDelay < switcher->interval) ? ui->intervalWarning : ui->intervalWarning->setVisible(false);
for (auto& s : switcher->sceneTransitions)
{
@ -209,6 +198,7 @@ SceneSwitcher::SceneSwitcher(QWidget* parent)
QListWidgetItem* item = new QListWidgetItem(text, ui->sceneTransitions);
item->setData(Qt::UserRole, text);
}
//(transitionDurationLongerThanInterval(switcher->interval)) ? ui->transitionWarning->setVisible(true) : ui->transitionWarning->setVisible(false);
for (auto& s : switcher->defaultSceneTransitions)
{