From b04fa862a1daeabd0a60a479cb5e3cacac4c94b2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 27 Nov 2020 17:57:57 +0100 Subject: Don't use else after return I don't always agree with this one, but in this case it's reasonable enough. --- src/Patchage.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/Patchage.cpp') diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 678967a..d4b4a36 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -92,11 +92,16 @@ port_order(const GanvPort* a, const GanvPort* b, void* data) if (pa && pb) { if (pa->order() && pb->order()) { return *pa->order() - *pb->order(); - } else if (pa->order()) { + } + + if (pa->order()) { return -1; - } else if (pb->order()) { + } + + if (pb->order()) { return 1; } + return pa->name().compare(pb->name()); } return 0; @@ -489,10 +494,10 @@ Patchage::update_toolbar() static bool updating = false; if (updating) { return; - } else { - updating = true; } + updating = true; + #if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) if (_jack_driver->is_attached()) { const jack_nframes_t buffer_size = _jack_driver->buffer_size(); -- cgit v1.2.1