mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-20 13:08:50 +02:00
6c193435cc
Currently creating new sources can cause a deadlock: OBSBasicSourceSelect locks the scene mutex when adding a new source (required to add invisible sources), and later OBSBasic tries to lock the graphics mutex (via CreatePropertiesWindow); meanwhile the graphics thread is holding the graphics mutex and tries to lock each scene as it renders them, resulting in a (non-obvious from the code) lock ordering conflict. Moving the CreatePropertiesWindow call out of the locked scene mutex restores the previous lock ordering; in addition, the requirement for keeping sourceSceneRefs for opening that initial properties window is removed
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
/******************************************************************************
|
|
Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
******************************************************************************/
|
|
|
|
#pragma once
|
|
|
|
#include <obs.hpp>
|
|
#include <memory>
|
|
|
|
#include "ui_OBSBasicSourceSelect.h"
|
|
|
|
class OBSBasic;
|
|
|
|
class OBSBasicSourceSelect : public QDialog {
|
|
Q_OBJECT
|
|
|
|
private:
|
|
std::unique_ptr<Ui::OBSBasicSourceSelect> ui;
|
|
const char *id;
|
|
|
|
static bool EnumSources(void *data, obs_source_t *source);
|
|
|
|
static void OBSSourceRemoved(void *data, calldata_t *calldata);
|
|
static void OBSSourceAdded(void *data, calldata_t *calldata);
|
|
|
|
private slots:
|
|
void on_buttonBox_accepted();
|
|
void on_buttonBox_rejected();
|
|
|
|
void SourceAdded(OBSSource source);
|
|
void SourceRemoved(OBSSource source);
|
|
|
|
public:
|
|
OBSBasicSourceSelect(OBSBasic *parent, const char *id);
|
|
|
|
OBSSource newSource;
|
|
};
|