diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
| commit | db1e60556c72b1b87ff2a384c556ccca724c46d6 (patch) | |
| tree | 22a5f4e9c4f436ef8e746e0a2d688de80c1597a6 /src/gui/popups/popupmenu.cpp | |
| parent | c2bb49be52a92deccec7428b6859242688fc8987 (diff) | |
| parent | 1716861f0ee2f7a3714c5b44bb0f017c3d8d3b2c (diff) | |
| download | plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.gz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.bz2 plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.xz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/popups/popupmenu.cpp')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 4f6bb3372..a9ca65b36 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -2574,8 +2574,11 @@ void PopupMenu::addPlayerRelation(const std::string &name) void PopupMenu::addFollow() { - // TRANSLATORS: popup menu item - mBrowserBox->addRow("follow", _("Follow")); + if (features.getBoolValue("allowFollow")) + { + // TRANSLATORS: popup menu item + mBrowserBox->addRow("follow", _("Follow")); + } // TRANSLATORS: popup menu item // TRANSLATORS: imitate player mBrowserBox->addRow("imitation", _("Imitation")); |