Merge pull request #3326 from WizardCM/single-popup
UI: Don't open second dialog if close event is ignoredmaster
commit
371e8334dd
|
@ -2640,8 +2640,12 @@ void OBSBasic::UpdatePreviewScalingMenu()
|
|||
|
||||
void OBSBasic::CreateInteractionWindow(obs_source_t *source)
|
||||
{
|
||||
bool closed = true;
|
||||
if (interaction)
|
||||
interaction->close();
|
||||
closed = interaction->close();
|
||||
|
||||
if (!closed)
|
||||
return;
|
||||
|
||||
interaction = new OBSBasicInteraction(this, source);
|
||||
interaction->Init();
|
||||
|
@ -2650,8 +2654,12 @@ void OBSBasic::CreateInteractionWindow(obs_source_t *source)
|
|||
|
||||
void OBSBasic::CreatePropertiesWindow(obs_source_t *source)
|
||||
{
|
||||
bool closed = true;
|
||||
if (properties)
|
||||
properties->close();
|
||||
closed = properties->close();
|
||||
|
||||
if (!closed)
|
||||
return;
|
||||
|
||||
properties = new OBSBasicProperties(this, source);
|
||||
properties->Init();
|
||||
|
@ -2660,8 +2668,12 @@ void OBSBasic::CreatePropertiesWindow(obs_source_t *source)
|
|||
|
||||
void OBSBasic::CreateFiltersWindow(obs_source_t *source)
|
||||
{
|
||||
bool closed = true;
|
||||
if (filters)
|
||||
filters->close();
|
||||
closed = filters->close();
|
||||
|
||||
if (!closed)
|
||||
return;
|
||||
|
||||
filters = new OBSBasicFilters(this, source);
|
||||
filters->Init();
|
||||
|
|
Loading…
Reference in New Issue