Skip to content
Snippets Groups Projects
Commit 8c729319 authored by interpretivechaos's avatar interpretivechaos
Browse files

Fixes splitter saving hang

parent 7a659e91
Branches
No related tags found
No related merge requests found
...@@ -90,7 +90,10 @@ void GenericEditor::constructorInitialize(GenericProcessor* owner, bool useDefau ...@@ -90,7 +90,10 @@ void GenericEditor::constructorInitialize(GenericProcessor* owner, bool useDefau
addChildComponent(channelSelector); addChildComponent(channelSelector);
channelSelector->setVisible(false); channelSelector->setVisible(false);
isSplitOrMerge=false;
}
else{
isSplitOrMerge=true;
} }
backgroundGradient = ColourGradient(Colour(190, 190, 190), 0.0f, 0.0f, backgroundGradient = ColourGradient(Colour(190, 190, 190), 0.0f, 0.0f,
...@@ -475,10 +478,17 @@ bool GenericEditor::getAudioStatus(int chan) ...@@ -475,10 +478,17 @@ bool GenericEditor::getAudioStatus(int chan)
void GenericEditor::getChannelSelectionState(int chan, bool* p, bool* r, bool* a) void GenericEditor::getChannelSelectionState(int chan, bool* p, bool* r, bool* a)
{ {
if (!isSplitOrMerge)
*p = channelSelector->getParamStatus(chan); {
*r = channelSelector->getRecordStatus(chan); *p = channelSelector->getParamStatus(chan);
*a = channelSelector->getAudioStatus(chan); *r = channelSelector->getRecordStatus(chan);
*a = channelSelector->getAudioStatus(chan);
}
else{
*p = FALSE;
*r = FALSE;
*a = FALSE;
}
} }
void GenericEditor::setChannelSelectionState(int chan, bool p, bool r, bool a) void GenericEditor::setChannelSelectionState(int chan, bool p, bool r, bool a)
......
...@@ -275,6 +275,8 @@ private: ...@@ -275,6 +275,8 @@ private:
bool isSelected; bool isSelected;
bool isEnabled; bool isEnabled;
/**Used to determine if an editor is a splitter or Merger to avoid calling on CHannelSelector*/
bool isSplitOrMerge;
int tNum; int tNum;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment