From c10eeed4a979ab3235ebf0565b3e8ad44e9f3671 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Tue, 21 Oct 2008 20:59:50 +0000 Subject: [PATCH] reverted to rev. 1766 - fixes broken label on LADSPA effects git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1792 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 3 +++ include/plugin.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 039df489a..5bb787b1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-10-21 Tobias Doerffel + * include/plugin.h: + reverted to rev. 1766 - fixes broken label on LADSPA effects + * include/knob.h: * src/gui/widgets/knob.cpp: track focusOutEvents in order to unhide cursor in certain situations diff --git a/include/plugin.h b/include/plugin.h index 8c29636cd..4affe9847 100644 --- a/include/plugin.h +++ b/include/plugin.h @@ -152,7 +152,8 @@ public: // returns display-name out of descriptor virtual QString displayName( void ) const { - return m_descriptor ? m_descriptor->displayName : + return model::displayName().isEmpty() ? + m_descriptor->displayName : model::displayName(); }