diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-22 02:50:20 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-22 02:50:20 +0000 |
| commit | 80084cc18b0f22d0bfebc9f6a1271d352116529e (patch) | |
| tree | d5f28d3f963d8b93500a504ffd388eccc41ae816 | |
| parent | e58aba80bf1086c205cf9275de0761b5b9602710 (diff) | |
fix weak ordering logic for plugin statuses
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6536 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/ardour/plugin_manager.h | 7 | ||||
| -rw-r--r-- | libs/ardour/plugin_manager.cc | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index 7dab6b0009..8c1f960fae 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -80,7 +80,12 @@ class PluginManager { } bool operator<(const PluginStatus& other) const { - return other.type < type || other.unique_id < unique_id; + if (other.type < type) { + return true; + } else if (other.type == type && other.unique_id < unique_id) { + return true; + } + return false; } }; typedef std::set<PluginStatus> PluginStatusList; diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 1c12410666..4f10c2d005 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -703,5 +703,4 @@ PluginManager::set_status (PluginType t, string id, PluginStatusType status) } pair<PluginStatusList::iterator, bool> res = statuses.insert (ps); - //cerr << "Added " << t << " " << id << " " << status << " success ? " << res.second << endl; } |