Skip to content

Commit

Permalink
Merge pull request #1760 from plugdata-team/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
timothyschoen authored Jul 21, 2024
2 parents fa1e5a2 + 46bfd87 commit d3d811f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
10 changes: 0 additions & 10 deletions Source/PluginProcessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,6 @@ void PluginProcessor::updateSearchPaths()

libpd_clear_search_path();

// Get pd's search paths
char* p[1024];
int numItems;
pd::Interface::getSearchPaths(p, &numItems);
auto currentPaths = StringArray(p, numItems);

auto paths = pd::Library::defaultPaths;

for (auto child : pathTree) {
Expand All @@ -334,14 +328,10 @@ void PluginProcessor::updateSearchPaths()
}

for (auto const& path : paths) {
if (currentPaths.contains(path.getFullPathName()))
continue;
libpd_add_to_search_path(path.getFullPathName().toRawUTF8());
}

for (auto const& path : DekenInterface::getExternalPaths()) {
if (currentPaths.contains(path))
continue;
libpd_add_to_search_path(path.replace("\\", "/").toRawUTF8());
}

Expand Down
2 changes: 1 addition & 1 deletion Source/TabComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ void TabComponent::showTab(Canvas* cnv, int splitIndex)
return;
}

if (splits[splitIndex]) {
if (splits[splitIndex] && splits[splitIndex] != splits[!splitIndex]) {
splits[splitIndex]->saveViewportState();
removeChildComponent(splits[splitIndex]->viewport.get());
}
Expand Down

0 comments on commit d3d811f

Please sign in to comment.