In popupmenu get group for local player before each menu.

2 files changed, 12 insertions, 0 deletions

diff --git a/src/resources/db/groupdb.cpp b/src/resources/db/groupdb.cpp
index fc61033cc..7b499018a 100644
--- a/src/resources/db/groupdb.cpp
+++ b/src/resources/db/groupdb.cpp
@@ -372,6 +372,17 @@ const std::string &GroupDb::getBadge(const int id)
     return (*it).second->badge;
 }
 
+const GroupInfo *GroupDb::getGroup(const int id)
+{
+    GroupInfos::const_iterator it = mGroups.find(id);
+    if (it == mGroups.end())
+    {
+        reportAlways("Unknown group id requested: %d", id);
+        return &mEmptyGroup;
+    }
+    return (*it).second;
+}
+
 #ifdef UNITTESTS
 GroupDb::GroupInfos &GroupDb::getGroups()
 {
diff --git a/src/resources/db/groupdb.h b/src/resources/db/groupdb.h
index 0115880bc..020649001 100644
--- a/src/resources/db/groupdb.h
+++ b/src/resources/db/groupdb.h
@@ -42,6 +42,7 @@ namespace GroupDb
     const std::string &getLongName(const int id) A_WARN_UNUSED;
     bool getShowBadge(const int id) A_WARN_UNUSED;
     const std::string &getBadge(const int id) A_WARN_UNUSED;
+    const GroupInfo *getGroup(const int id) A_WARN_UNUSED RETURNS_NONNULL;
 
     typedef std::map<int, GroupInfo*> GroupInfos;
     typedef GroupInfos::iterator GroupInfosIter;