Merge cdd9190dfe into 55de086026

mixer/src/Mixer.C

@@ -891,7 +891,7 @@ Mixer::rows ( int ideal_rows )
 
     _rows = ideal_rows;
     
-    if ( _strip_height != sh );
+    if ( _strip_height != sh )
     {
         mixer_strips->redraw();
         scroll->redraw();

mixer/src/Plugin_Chooser.C

@@ -71,23 +71,23 @@ Plugin_Chooser::search ( const char *name, const char *author, const char *categ
                   ( p->audio_inputs == 1 && p->audio_outputs == 1 ) ) )
                 continue;
 
-                if ( p->audio_outputs == 0 || p->audio_inputs == 0 )
+            if ( p->audio_outputs == 0 || p->audio_inputs == 0 )
                 /* we don't support these */
                 continue;
 
-                if ( favorites > 0 && ! p->favorite )
+            if ( favorites > 0 && ! p->favorite )
+                continue;
+            
+            if ( strcmp( category, "Any" ) )
+            {
+                if ( !p->category.c_str() && strcmp( category, "Unclassified" ))
                     continue;
                 
-                if ( strcmp( category, "Any" ) )
-                {
-                    if ( !p->category.c_str() && strcmp( category, "Unclassified" ))
-                        continue;
-                    
-                    if (strncmp( p->category.c_str(), category, strlen( category )))
-                        continue;
-                }
-
-                _plugin_rows.push_back( p );
+                if (strncmp( p->category.c_str(), category, strlen( category )))
+                    continue;
+            }
+
+            _plugin_rows.push_back( p );
         }
     }
 

session-manager/src/jackpatch.c

@@ -693,7 +693,7 @@ dequeue_new_port ( void )
 
     if ( sizeof( int ) == jack_ringbuffer_peek( port_ringbuffer, (char*)&size, sizeof( int ) ) )
     {
-        if ( jack_ringbuffer_read_space( port_ringbuffer ) >= size );
+        if ( jack_ringbuffer_read_space( port_ringbuffer ) >= size )
         {
             struct port_notification_record *pr = malloc( size );