Skip to content

Commit fa96827

Browse files
committed
fixed sonogram crash when data vector inlet empty
1 parent 80d2c97 commit fa96827

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/objects/gui/moSonogram.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ void moSonogram::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
101101

102102
//--------------------------------------------------------------
103103
void moSonogram::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjects){
104+
unusedArgs(patchObjects);
105+
104106
if(this->inletsConnected[0]){
105107
if(ofGetElapsedTimeMillis()-resetTime > wait){
106108
resetTime = ofGetElapsedTimeMillis();
@@ -127,14 +129,15 @@ void moSonogram::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObje
127129

128130
//--------------------------------------------------------------
129131
void moSonogram::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
132+
unusedArgs(font,glRenderer);
130133

131134
// background
132135
if(scaledObjW*canvasZoom > 90.0f){
133136
ofSetColor(34,34,34);
134137
ofDrawRectangle(objOriginX - (IMGUI_EX_NODE_PINS_WIDTH_NORMAL*this->scaleFactor/canvasZoom), objOriginY-(IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor/canvasZoom),scaledObjW + (IMGUI_EX_NODE_PINS_WIDTH_NORMAL*this->scaleFactor/canvasZoom),scaledObjH + (((IMGUI_EX_NODE_HEADER_HEIGHT+IMGUI_EX_NODE_FOOTER_HEIGHT)*this->scaleFactor)/canvasZoom) );
135138
}
136139

137-
if(this->inletsConnected[0]){
140+
if(this->inletsConnected[0] && !static_cast<vector<float> *>(_inletParams[0])->empty()){
138141
sonogram->begin();
139142
glPushAttrib(GL_ALL_ATTRIB_BITS);
140143
glBlendFuncSeparate(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA,GL_ONE,GL_ONE_MINUS_SRC_ALPHA);
@@ -221,7 +224,7 @@ void moSonogram::drawObjectNodeConfig(){
221224

222225
//--------------------------------------------------------------
223226
void moSonogram::removeObjectContent(bool removeFileFromData){
224-
227+
unusedArgs(removeFileFromData);
225228
}
226229

227230
//--------------------------------------------------------------

0 commit comments

Comments
 (0)