Skip to content

Commit bba640e

Browse files
committed
Prevent double-adding tabs when using merger
1 parent f6b4ec3 commit bba640e

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

Source/UI/DataViewport.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ int DataViewport::addTabToDataViewport(String name,
4747
if (tabArray.size() == 0)
4848
setVisible(true);
4949

50-
50+
if (tabArray.contains(tabIndex))
51+
return tabIndex;
5152

5253
addTab(name, Colours::lightgrey, component, false, tabIndex);
5354

@@ -59,11 +60,11 @@ int DataViewport::addTabToDataViewport(String name,
5960
tabArray.add(tabIndex);
6061

6162
//std::cout << "Tab Array: ";
62-
// for (int i = 0; i < tabArray.size(); i++)
63-
// std::cout << tabArray[i] << " ";
64-
// std::cout << std::endl;
63+
//for (int i = 0; i < tabArray.size(); i++)
64+
// std::cout << tabArray[i] << " ";
65+
//std::cout << std::endl;
6566

66-
//LOGD("Data Viewport adding tab with index ", tabIndex);
67+
LOGD("Data Viewport adding tab with index ", tabIndex);
6768

6869
setCurrentTabIndex(tabArray.size()-1);
6970

@@ -108,7 +109,7 @@ void DataViewport::destroyTab(int index)
108109
setCurrentTabIndex(tabArray.size()-1);
109110

110111
//std::cout << "Tab Array: ";
111-
// for (int i = 0; i < tabArray.size(); i++)
112+
//for (int i = 0; i < tabArray.size(); i++)
112113
// std::cout << tabArray[i] << " ";
113114
//std::cout << std::endl;
114115

0 commit comments

Comments
 (0)