etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-26 14:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix possible crash when changing colors

Browse source 
if chan osc threads >= 0
This commit is contained in:
tildearrow 2024-04-21 12:47:25 -05:00
parent ca5cf58d00
commit 7fdc826f83
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/engine/workPool.cpp
View file

@ -95,7 +95,11 @@ bool DivWorkThread::busy() {
void DivWorkThread::finish() {
lock.lock();
terminate=true;
notify.set_value();
try {
notify.set_value();
} catch (std::future_error& e) {
logE("future error! beware!");
}
lock.unlock();
thread->join();
}
@ -196,9 +200,11 @@ DivWorkPool::DivWorkPool(unsigned int threads):
DivWorkPool::~DivWorkPool() {
if (threaded) {
for (unsigned int i=0; i<count; i++) {
workThreads[i].finish();
if (workThreads!=NULL) {
for (unsigned int i=0; i<count; i++) {
workThreads[i].finish();
}
delete[] workThreads;
}
delete[] workThreads;
}
}

10
src/gui/settings.cpp
View file

@ -5437,10 +5437,12 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
}
}
// chan osc work pool
if (chanOscWorkPool!=NULL) {
delete chanOscWorkPool;
chanOscWorkPool=NULL;
if (updateFonts) {
// chan osc work pool
if (chanOscWorkPool!=NULL) {
delete chanOscWorkPool;
chanOscWorkPool=NULL;
}
}
for (int i=0; i<64; i++) {